diff --git a/.bzrignore b/.bzrignore
index 941e6e1c4cd0ab68667c9ba31a6090cf6ac63b81..a704a5acbe8e14c3b6c90e41f8fa5a40ac9d6472 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -1,10 +1,10 @@
 AST
 *.class
 semantic.cache
-x3d/GeneratedAspects.jrag
-x3d/Parser.java
-x3d/x3d.ast
-x3d/x3d.jjt
+examples/x3d/GeneratedAspects.jrag
+examples/x3d/Parser.java
+examples/x3d/x3d.ast
+examples/x3d/x3d.jjt
 javadoc
-x3d/PrettyPrint.java
+examples/x3d/PrettyPrint.java
 SchemaCompile.jar
diff --git a/GenCompiler.java b/GenCompiler.java
index 084bba2f5902f83a65d4c390eff212ab03e2e248..894ddcee376f224d8770e4886f9c1d9f2e904ec3 100644
--- a/GenCompiler.java
+++ b/GenCompiler.java
@@ -13,7 +13,7 @@ import java.io.PrintStream;
 public class GenCompiler extends Parser {
 	public static void main(String args[]) {
 
-        String dir = "x3d";
+        String dir = "examples/x3d";
         String outName = "x3d";
         String[] schema = new String[1];
         boolean first = true;
diff --git a/build.xml b/build.xml
index 9b9cb915a31c9ac9c0d929620662e97f795fba72..8cc048bc34bf1aceea555f3a836fb6b4ead5e9e8 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@
 
   <!-- compile sources -->
   <target name="build" depends="gen">
-    <javac compiler="jikes" debug="true" nowarn="true" srcdir="." includes="**/*.java" excludes="tools/** x3d/**" classpath=".:${tools}/beaver-rt.jar:${tools}/junit.jar"/>
+    <javac compiler="jikes" debug="true" nowarn="true" srcdir="." includes="**/*.java" excludes="tools/** examples/**" classpath=".:${tools}/beaver-rt.jar:${tools}/junit.jar"/>
   </target>
   
   <!-- generate compiler source files -->
diff --git a/x3d/BoundingBox.jrag b/examples/x3d/BoundingBox.jrag
similarity index 100%
rename from x3d/BoundingBox.jrag
rename to examples/x3d/BoundingBox.jrag
diff --git a/x3d/OBB.java b/examples/x3d/OBB.java
similarity index 100%
rename from x3d/OBB.java
rename to examples/x3d/OBB.java
diff --git a/x3d/build.xml b/examples/x3d/build.xml
similarity index 94%
rename from x3d/build.xml
rename to examples/x3d/build.xml
index da1cd828ff607cc558276717aea6731b6bcacdea..6658b167896a417060c0797f4b8e4a82eef934ad 100644
--- a/x3d/build.xml
+++ b/examples/x3d/build.xml
@@ -12,9 +12,9 @@
   <property name="package" value="AST"/>
 
   <!-- "tools" is the directory where generators and libraries are located. -->
-  <property name="tools" value="../tools"/>
+  <property name="tools" value="../../tools"/>
 
-  <property name="javacc.home" value="../tools/javacc-4.0"/>
+  <property name="javacc.home" value="../../tools/javacc-4.0"/>
   
   <property name="parser.name" value="XmlParser"/>
   
@@ -23,7 +23,7 @@
   <!-- "beaver" is an ant task class for the parser generator in beaver.jar -->
 <!--   <taskdef name="beaver" classname="beaver.comp.run.AntTask" classpath="tools/beaver.jar"/> -->
   <!-- "jastadd" is an ant task class in jastadd2.jar -->
-  <taskdef name="jastadd" classname="jastadd.JastAddTask" classpath="../tools/jastadd2.jar"/>
+  <taskdef name="jastadd" classname="jastadd.JastAddTask" classpath="../../tools/jastadd2.jar"/>
 
   <!-- compile sources -->
   <target name="build" depends="gen">
diff --git a/x3d/test.x3d b/examples/x3d/test.x3d
similarity index 100%
rename from x3d/test.x3d
rename to examples/x3d/test.x3d