diff --git a/webapp/build.xml b/webapp/build.xml
index 0a009efa7..e9109d57d 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -115,7 +115,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 				</not>
 			</condition>
 		</fail>
-		
+<!--		
 		<fail message="The vitro.home.directory &quot;${vitro.home.directory}&quot; is not writable.">
 		    <condition>
 		        <not>
@@ -125,7 +125,7 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		        </not>
 		    </condition>
 		</fail>
-
+-->
 		<property name="solr.home.dir" location="${vitro.home.directory}/solr" />
 	</target>
 
@@ -137,15 +137,15 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 		<delete dir="${solr.home.dir}" excludes="data/**/*" includeemptydirs="true" />
 	</target>
 
-	<!-- - - - - - - - - - - - - - - - - - 
-          target: compileUtilities                      
-         - - - - - - - - - - - - - - - - - -->
-	<target name="compileUtilities">
+	<!-- - - - - - - - - - - - - - - - - - 
+          target: compileUtilities                      
+         - - - - - - - - - - - - - - - - - -->
+	<target name="compileUtilities">
 		<mkdir dir="${utility.classes.dir}" />
 		<javac srcdir="${utilities.source.dir}" destdir="${utility.classes.dir}" debug="true" deprecation="${javac.deprecation}" encoding="UTF8" includeantruntime="false" optimize="false" source="1.6">
 			<classpath refid="utility.compile.classpath" />
 		</javac>
-	</target>
+	</target>
 
 	<!-- - - - - - - - - - - - - - - - - - 
           target: prepare                      
diff --git a/webapp/web/WEB-INF/web.xml b/webapp/web/WEB-INF/web.xml
index 06a83a5c1..0287959bd 100644
--- a/webapp/web/WEB-INF/web.xml
+++ b/webapp/web/WEB-INF/web.xml
@@ -614,11 +614,11 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>AllClassGroupsListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController</servlet-class>
+    <servlet-name>ListClassGroupsController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListClassGroupsController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>AllClassGroupsListingController</servlet-name>
+    <servlet-name>ListClassGroupsController</servlet-name>
     <url-pattern>/listGroups</url-pattern>
   </servlet-mapping>
 
@@ -758,11 +758,11 @@
   </servlet-mapping>
 
   <servlet>
-    <servlet-name>VClassWebappsListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.VClassWebappsListingController</servlet-class>
+    <servlet-name>ListVClassWebappsController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>VClassWebappsListingController</servlet-name>
+    <servlet-name>ListVClassWebappsController</servlet-name>
     <url-pattern>/listVClassWebapps</url-pattern>
   </servlet-mapping>
 
@@ -777,11 +777,11 @@
 
 
   <servlet>
-    <servlet-name>ClassHierarchyListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ClassHierarchyListingController</servlet-class>
+    <servlet-name>ShowClassHierarchyController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ShowClassHierarchyController</servlet-class>
   </servlet>
   <servlet-mapping>
-    <servlet-name>ClassHierarchyListingController</servlet-name>
+    <servlet-name>ShowClassHierarchyController</servlet-name>
     <url-pattern>/showClassHierarchy</url-pattern>
   </servlet-mapping>