diff --git a/.bzrignore b/.bzrignore
index 4a1becb484b6458853ddc2d1d6dcb947ebaaab77..6e4e32b9a82793a418aab0ea43411d7f1cb12ef1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -23,3 +23,5 @@ xdf.ast
 xdf.jjt
 examples/actors/xdf/xdfAST
 examples/actors/xlim/xlimAST
+examples/actors/xlimAST
+examples/actors/xdfAST
diff --git a/examples/actors/xlim/AddFiveOnce_0.xlim b/examples/actors/AddFiveOnce_0.xlim
similarity index 100%
rename from examples/actors/xlim/AddFiveOnce_0.xlim
rename to examples/actors/AddFiveOnce_0.xlim
diff --git a/examples/actors/xlim/AddOne_0.xlim b/examples/actors/AddOne_0.xlim
similarity index 100%
rename from examples/actors/xlim/AddOne_0.xlim
rename to examples/actors/AddOne_0.xlim
diff --git a/examples/actors/xlim/Double_0.xlim b/examples/actors/Double_0.xlim
similarity index 100%
rename from examples/actors/xlim/Double_0.xlim
rename to examples/actors/Double_0.xlim
diff --git a/examples/actors/xlim/SDFAnalysis.java b/examples/actors/SDFAnalysis.java
similarity index 90%
rename from examples/actors/xlim/SDFAnalysis.java
rename to examples/actors/SDFAnalysis.java
index 16217fb0c38c18296147845ee551487c5b1124fe..0a9d42c74fdd0ac7c225b132da37205f7a7dc87c 100644
--- a/examples/actors/xlim/SDFAnalysis.java
+++ b/examples/actors/SDFAnalysis.java
@@ -9,7 +9,7 @@
 
 import xlimAST.Start;
 
-public class SDFAnalysis extends Parser {
+public class SDFAnalysis extends XlimParser {
 	public static void main(String args[]) {
 		Start ast = parse(args);
 
diff --git a/examples/actors/xdf/SSRAnalysis.java b/examples/actors/SSRAnalysis.java
similarity index 94%
rename from examples/actors/xdf/SSRAnalysis.java
rename to examples/actors/SSRAnalysis.java
index 6615ac578335fab64e17baba925280c419607c0b..a39078ec5549138fca51ceeb424aa87dcb5b2ceb 100644
--- a/examples/actors/xdf/SSRAnalysis.java
+++ b/examples/actors/SSRAnalysis.java
@@ -10,7 +10,7 @@ import xdfAST.Start;
 import xdfAST.Instance;
 import java.util.LinkedList;
 
-public class SSRAnalysis extends Parser {
+public class SSRAnalysis extends XdfParser {
 	public static void main(String args[]) {
 		Start ast = parse(args);
 
diff --git a/examples/actors/xlim/SubOne_0.xlim b/examples/actors/SubOne_0.xlim
similarity index 100%
rename from examples/actors/xlim/SubOne_0.xlim
rename to examples/actors/SubOne_0.xlim
diff --git a/examples/actors/xdf/sdftest.xdf b/examples/actors/sdftest.xdf
similarity index 100%
rename from examples/actors/xdf/sdftest.xdf
rename to examples/actors/sdftest.xdf
diff --git a/examples/actors/xdf/build.xml b/examples/actors/xdf/build.xml
index 21d3502ddeb45198d9cd603635b7e285775a88cd..53a6aa0dbcf31e1293af59a7d5f22bb4efddb850 100644
--- a/examples/actors/xdf/build.xml
+++ b/examples/actors/xdf/build.xml
@@ -35,7 +35,7 @@
     <!-- create AST node types and weave aspect modules -->
     <echo message = "Running JastAdd"/>
 <!--     <jastadd package="${package}" rewrite="true" beaver="true" novisitcheck="true"> -->
-    <jastadd package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
+    <jastadd outdir="." package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
       <fileset dir=".">
 	<include name="*.ast"/>
 	<include name="*.jrag"/>
@@ -44,7 +44,7 @@
     </jastadd>
     <jjtree 
        target="xdf.jjt" 
-       outputdirectory="${package}" 
+       outputdirectory="../${package}" 
        javacchome="${javacc.home}"
        buildnodefiles="true"
        static="false"
@@ -55,8 +55,8 @@
        nodepackage="${package}"
        />
     <javacc
-       target="${package}/xdf.jj"
-       outputdirectory="${package}"
+       target="../${package}/xdf.jj"
+       outputdirectory="../${package}"
        javacchome="${javacc.home}"
        buildparser="true"
        buildtokenmanager="true"
diff --git a/examples/actors/xlim/build.xml b/examples/actors/xlim/build.xml
index e8c77ad63cccb27f000d94a30088b3373d780557..b276728ea618abde75c6bf89f1c37720add43e3b 100644
--- a/examples/actors/xlim/build.xml
+++ b/examples/actors/xlim/build.xml
@@ -35,7 +35,7 @@
     <!-- create AST node types and weave aspect modules -->
     <echo message = "Running JastAdd"/>
 <!--     <jastadd package="${package}" rewrite="true" beaver="true" novisitcheck="true"> -->
-    <jastadd package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
+    <jastadd outdir="." package="${package}" grammar="${parser.name}" rewrite="true" jjtree="true">
       <fileset dir=".">
 	<include name="*.ast"/>
 	<include name="*.jrag"/>
@@ -44,7 +44,7 @@
     </jastadd>
     <jjtree 
        target="xlim.jjt" 
-       outputdirectory="${package}" 
+       outputdirectory="../${package}" 
        javacchome="${javacc.home}"
        buildnodefiles="true"
        static="false"
@@ -55,8 +55,8 @@
        nodepackage="${package}"
        />
     <javacc
-       target="${package}/xlim.jj"
-       outputdirectory="${package}"
+       target="../${package}/xlim.jj"
+       outputdirectory="../${package}"
        javacchome="${javacc.home}"
        buildparser="true"
        buildtokenmanager="true"