diff --git a/webapp/build.xml b/webapp/build.xml
index 0abb4fca8..7da86e31f 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -131,14 +131,9 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<mkdir dir="${war-resources.dir}" />
 		<mkdir dir="${test-classes.dir}" />
 
-		<!-- copy all sorts of web stuff (with or without themes) into the war directory. -->
+		<!-- copy all sorts of web stuff into the war directory. -->
 		<copy todir="${war.dir}">
 			<fileset dir="${appbase.dir}/web">
-				<!--
-					If a product doesn't want the core themes, it can
-					set this property and they will be skipped. 
-				-->
-				<exclude name="themes/**/*" if="skip.core.themes" />
 			</fileset>
 			<fileset dir="${appbase.dir}">
 				<include name="themes/**/*" />
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 19ef4a7fc..37dfebcc1 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -49,8 +49,6 @@
 	<target name="product-prepare">
 		<mkdir dir="${appbase.dir}" />
 		<mkdir dir="${appbase.dir}/web" />
-		<mkdir dir="${appbase.dir}/src" />
-		<mkdir dir="${appbase.dir}/test" />
 
 		<copy todir="${appbase.dir}/web" includeemptydirs="true">
 			<dirDifference dir="${inner.basedir}/web">
@@ -67,12 +65,13 @@
 			<fileset dir="${inner.basedir}/config" />
 		</copy>
 
-		<!-- -->
 		<copy todir="${appbase.dir}" includeemptydirs="true">
 			<dirDifference dir="${inner.basedir}">
 				<include name="src/**/*" />
 				<include name="lib/**/*" />
 				<include name="test/**/*" />
+				<include name="themes/**/*" unless="skip.core.themes"/>
+				<include name="context.xml" />
 				<blockingPath>
 					<pathelement location="." />
 				</blockingPath>
@@ -83,14 +82,10 @@
 				<include name="src/**/*" />
 				<include name="lib/**/*" />
 				<include name="test/**/*" />
+				<include name="themes/**/*" />
+				<include name="context.xml" />
 			</fileset>
 		</copy>
-
-		<copy todir="${appbase.dir}/themes" includeemptydirs="true">
-			<fileset dir="./themes" erroronmissingdir="false" />
-		</copy>
-
-		<copy tofile="${appbase.dir}/context.xml" file="${inner.basedir}/context.xml" />
 	</target>
 	<!-- ================================= 
           target: describe              
@@ -180,49 +175,6 @@
 	===========================================================================
 	-->
 
-	<!-- Is there a "src" directory in the product? -->
-	<property name="product.source.dir" location="./src" />
-	<available property="product.sources.exist" file="${product.source.dir}" />
-
-	<!-- Is there a "test" directory in the product? -->
-	<property name="product.test.dir" location="./test" />
-	<available property="product.tests.exist" file="${product.test.dir}" />
-
-	<!-- Is there a "themes" directory in the product? -->
-	<property name="product.themes.dir" location="./themes" />
-	<available property="product.themes.exist" file="${product.themes.dir}" />
-
-	<!-- Is there a modifications directory in the product? -->
-	<property name="product.modifications.dir" location="./modifications" />
-	<available property="product.modifications.exist" file="${product.modifications.dir}" />
-
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: productPrepare                      
-         - - - - - - - - - - - - - - - - - -->
-	<target name="productPrepare">
-		<antcall target="prepareThemes" />
-		<antcall target="prepareModifications" />
-	</target>
-
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: prepareThemes                      
-         - - - - - - - - - - - - - - - - - -->
-	<target name="prepareThemes" if="product.themes.exist">
-		<copy todir="${build.dir}/war/themes" overwrite="true">
-			<fileset dir="${product.themes.dir}" />
-		</copy>
-	</target>
-
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: prepareModifications                      
-         - - - - - - - - - - - - - - - - - -->
-	<target name="prepareModifications" if="product.modifications.exist">
-		<copy todir="${build.dir}/war" overwrite="true">
-			<fileset dir="${product.modifications.dir}" />
-		</copy>
-	</target>
-
-
 	<!-- ================================= 
           target: jar              
          ================================= -->
diff --git a/webapp/web/themes/vitro/css/ie6.css b/webapp/themes/vitro/css/ie6.css
similarity index 100%
rename from webapp/web/themes/vitro/css/ie6.css
rename to webapp/themes/vitro/css/ie6.css
diff --git a/webapp/web/themes/vitro/css/ie7.css b/webapp/themes/vitro/css/ie7.css
similarity index 100%
rename from webapp/web/themes/vitro/css/ie7.css
rename to webapp/themes/vitro/css/ie7.css
diff --git a/webapp/web/themes/vitro/css/reset.css b/webapp/themes/vitro/css/reset.css
similarity index 100%
rename from webapp/web/themes/vitro/css/reset.css
rename to webapp/themes/vitro/css/reset.css
diff --git a/webapp/web/themes/vitro/css/screen.css b/webapp/themes/vitro/css/screen.css
similarity index 100%
rename from webapp/web/themes/vitro/css/screen.css
rename to webapp/themes/vitro/css/screen.css
diff --git a/webapp/web/themes/vitro/css/vitroTheme.css b/webapp/themes/vitro/css/vitroTheme.css
similarity index 100%
rename from webapp/web/themes/vitro/css/vitroTheme.css
rename to webapp/themes/vitro/css/vitroTheme.css
diff --git a/webapp/web/themes/vitro/images/VITRO-logo.png b/webapp/themes/vitro/images/VITRO-logo.png
similarity index 100%
rename from webapp/web/themes/vitro/images/VITRO-logo.png
rename to webapp/themes/vitro/images/VITRO-logo.png
diff --git a/webapp/web/themes/vitro/images/alert-overlay.png b/webapp/themes/vitro/images/alert-overlay.png
similarity index 100%
rename from webapp/web/themes/vitro/images/alert-overlay.png
rename to webapp/themes/vitro/images/alert-overlay.png
diff --git a/webapp/web/themes/vitro/images/arrow-grey.gif b/webapp/themes/vitro/images/arrow-grey.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/arrow-grey.gif
rename to webapp/themes/vitro/images/arrow-grey.gif
diff --git a/webapp/web/themes/vitro/images/bullet.gif b/webapp/themes/vitro/images/bullet.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/bullet.gif
rename to webapp/themes/vitro/images/bullet.gif
diff --git a/webapp/web/themes/vitro/images/header-background.gif b/webapp/themes/vitro/images/header-background.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/header-background.gif
rename to webapp/themes/vitro/images/header-background.gif
diff --git a/webapp/web/themes/vitro/images/intro.gif b/webapp/themes/vitro/images/intro.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/intro.gif
rename to webapp/themes/vitro/images/intro.gif
diff --git a/webapp/web/themes/vitro/images/jump-tp-property-group-menu.gif b/webapp/themes/vitro/images/jump-tp-property-group-menu.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/jump-tp-property-group-menu.gif
rename to webapp/themes/vitro/images/jump-tp-property-group-menu.gif
diff --git a/webapp/web/themes/vitro/images/pointToCropPreview.jpg b/webapp/themes/vitro/images/pointToCropPreview.jpg
similarity index 100%
rename from webapp/web/themes/vitro/images/pointToCropPreview.jpg
rename to webapp/themes/vitro/images/pointToCropPreview.jpg
diff --git a/webapp/web/themes/vitro/images/rollover-nav.gif b/webapp/themes/vitro/images/rollover-nav.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/rollover-nav.gif
rename to webapp/themes/vitro/images/rollover-nav.gif
diff --git a/webapp/web/themes/vitro/images/search-interior-pages.gif b/webapp/themes/vitro/images/search-interior-pages.gif
similarity index 100%
rename from webapp/web/themes/vitro/images/search-interior-pages.gif
rename to webapp/themes/vitro/images/search-interior-pages.gif
diff --git a/webapp/web/themes/vitro/images/search-interior-pages.png b/webapp/themes/vitro/images/search-interior-pages.png
similarity index 100%
rename from webapp/web/themes/vitro/images/search-interior-pages.png
rename to webapp/themes/vitro/images/search-interior-pages.png
diff --git a/webapp/web/themes/vitro/images/separator-main-nav.jpg b/webapp/themes/vitro/images/separator-main-nav.jpg
similarity index 100%
rename from webapp/web/themes/vitro/images/separator-main-nav.jpg
rename to webapp/themes/vitro/images/separator-main-nav.jpg
diff --git a/webapp/web/themes/vitro/images/separator-property-group-nav.jpg b/webapp/themes/vitro/images/separator-property-group-nav.jpg
similarity index 100%
rename from webapp/web/themes/vitro/images/separator-property-group-nav.jpg
rename to webapp/themes/vitro/images/separator-property-group-nav.jpg
diff --git a/webapp/web/themes/vitro/templates/footer.ftl b/webapp/themes/vitro/templates/footer.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/footer.ftl
rename to webapp/themes/vitro/templates/footer.ftl
diff --git a/webapp/web/themes/vitro/templates/googleAnalytics.ftl b/webapp/themes/vitro/templates/googleAnalytics.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/googleAnalytics.ftl
rename to webapp/themes/vitro/templates/googleAnalytics.ftl
diff --git a/webapp/web/themes/vitro/templates/head.ftl b/webapp/themes/vitro/templates/head.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/head.ftl
rename to webapp/themes/vitro/templates/head.ftl
diff --git a/webapp/web/themes/vitro/templates/identity.ftl b/webapp/themes/vitro/templates/identity.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/identity.ftl
rename to webapp/themes/vitro/templates/identity.ftl
diff --git a/webapp/web/themes/vitro/templates/menu.ftl b/webapp/themes/vitro/templates/menu.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/menu.ftl
rename to webapp/themes/vitro/templates/menu.ftl
diff --git a/webapp/web/themes/vitro/templates/page-home.ftl b/webapp/themes/vitro/templates/page-home.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/page-home.ftl
rename to webapp/themes/vitro/templates/page-home.ftl
diff --git a/webapp/web/themes/vitro/templates/page.ftl b/webapp/themes/vitro/templates/page.ftl
similarity index 100%
rename from webapp/web/themes/vitro/templates/page.ftl
rename to webapp/themes/vitro/templates/page.ftl