Index: build.xml
===================================================================
--- build.xml	(revision 14498)
+++ build.xml	(working copy)
@@ -69,7 +69,7 @@
 
   -->
 
-<project basedir=".." default="package" name="argouml">
+<project basedir="." default="package" name="argouml">
   
   <!-- =================================================================== -->
   <!-- Global initialization                                               -->
@@ -147,7 +147,7 @@
     </tstamp>
 
     <property name="local.build.properties" 
-              value="argouml-build/build.properties"/>
+              value="build.properties"/>
     <property name="user.build.properties" 
               value="${user.home}/argouml.build.properties"/>
     <property file="${local.build.properties}"/>
@@ -157,7 +157,7 @@
     <!-- if it is set in a property file before now, it must be absolute -->
     <property name="argo.root.dir" value="${basedir}" />
     <property file="${override.build.properties}"/>
-    <property file="argouml-build/default.properties"/>
+    <property file="default.properties"/>
 
     <property name="tests.reports" value="${argo.build.dir}/tests"/>
 
@@ -238,36 +238,36 @@
           description="Prepare all jar files, both built and just delivered.">
 
     <!-- Build the subdirs in order. -->
-    <ant dir="argouml-core-infra" inheritAll="false"           target="jar"/>
-    <ant dir="argouml-core-model" inheritAll="false"           target="jar"/>
-    <ant dir="argouml-core-model-mdr" inheritAll="false"       target="jar"/>
+    <ant dir="../argouml-core-infra" inheritAll="false"           target="jar"/>
+    <ant dir="../argouml-core-model" inheritAll="false"           target="jar"/>
+    <ant dir="../argouml-core-model-mdr" inheritAll="false"       target="jar"/>
 <!--
     <ant dir="argouml-core-model-euml" inheritAll="false"      target="jar"/>
 -->
-    <ant dir="argouml-app" inheritAll="false"                  target="jar"/>
+    <ant dir="../argouml-app" inheritAll="false"                  target="jar"/>
 
     <!-- Copy everything to the build directory -->
     <mkdir dir="${argo.build.dir}"/>
 
     <copy todir="${argo.build.dir}">
-      <fileset dir="argouml-core-infra/build">
+      <fileset dir="../argouml-core-infra/build">
         <include name="*"/>
       </fileset>
-      <fileset dir="argouml-core-model/build">
+      <fileset dir="../argouml-core-model/build">
         <include name="*"/>
       </fileset>
-      <fileset dir="argouml-core-model-mdr/build">
+      <fileset dir="../argouml-core-model-mdr/build">
         <include name="*"/>
       </fileset>
       <!-- model-euml Not currently included -->
-      <fileset dir="argouml-app/build">
+      <fileset dir="../argouml-app/build">
         <include name="*"/>
       </fileset>
     </copy>
 
     <!-- The argouml.jar is copied again and again since it is modified below -->
     <copy todir="${argo.build.dir}" overwrite="on">
-      <fileset dir="argouml-app/build">
+      <fileset dir="../argouml-app/build">
         <include name="argouml.jar"/>
       </fileset>
     </copy>
Index: default.properties
===================================================================
--- default.properties	(revision 14498)
+++ default.properties	(working copy)
@@ -36,12 +36,12 @@
 # set in one of the user's property files.  It should be set to an absolute
 # path so that it works for subcomponent builds.
 #
-argo.tools.dir=${argo.root.dir}/argouml-core-tools
-argo.model.dir=${argo.root.dir}/argouml-core-model
-argo.mdr.dir=${argo.root.dir}/argouml-core-model-mdr
-argo.euml.dir=${argo.root.dir}/argouml-core-model-emul
+argo.tools.dir=${argo.root.dir}/../argouml-core-tools
+argo.model.dir=${argo.root.dir}/../argouml-core-model
+argo.mdr.dir=${argo.root.dir}/../argouml-core-model-mdr
+argo.euml.dir=${argo.root.dir}/../argouml-core-model-emul
 #
-argo.build.dir=${argo.root.dir}/build
+argo.build.dir=${argo.root.dir}/../../build
 #
 argo.tests.dir=${argo.build.dir}/tests
 argo.tests.classes=${argo.tests.dir}/classes