diff --git a/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/controller-context-legacy.xml b/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/controller-context-legacy.xml
index 250e8515..e8527c44 100644
--- a/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/controller-context-legacy.xml
+++ b/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/controller-context-legacy.xml
@@ -12,17 +12,17 @@
 	<bean class="org.springframework.batch.admin.web.JobExecutionController" />
 
 	<!-- Override the location of the resource descriptors for the home page -->
-	<util:properties id="defaultResources" location="classpath:/org/springframework/batch/admin/web/manager/html-resources.properties" />
-	<util:properties id="jsonResources" location="classpath:/org/springframework/batch/admin/web/manager/json-resources.properties" />
-	
-	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basenames">
-			<list>
-				<value>org/springframework/batch/admin/web/manager/html-resources</value>
-				<value>org/springframework/batch/admin/web/manager/json-resources</value>
-			</list>
-		</property>
-	</bean>
+	<!--<util:properties id="defaultResources" location="classpath:/org/springframework/batch/admin/web/managerOld/html-resources.properties" />-->
+	<!--<util:properties id="jsonResources" location="classpath:/org/springframework/batch/admin/web/managerOld/json-resources.properties" />-->
+	<!-- -->
+	<!--<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">-->
+		<!--<property name="basenames">-->
+			<!--<list>-->
+				<!--<value>org/springframework/batch/admin/web/manager/html-resources</value>-->
+				<!--<value>org/springframework/batch/admin/web/manager/json-resources</value>-->
+			<!--</list>-->
+		<!--</property>-->
+	<!--</bean>-->
 
 	<bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
 </beans>
diff --git a/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/manager-context.xml b/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/manager-context.xml
index 58b0cdff..30540caa 100644
--- a/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/manager-context.xml
+++ b/spring-batch-admin-manager/src/main/resources/META-INF/spring/batch/servlet/manager/manager-context.xml
@@ -3,203 +3,203 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
                                  http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<bean class="org.springframework.batch.admin.web.HomeMenu" parent="baseMenu"/>
-	<bean class="org.springframework.batch.admin.web.JobsMenu" parent="baseMenu"/>
-	<bean class="org.springframework.batch.admin.web.ExecutionsMenu" parent="baseMenu"/>
-	<bean class="org.springframework.batch.admin.web.FilesMenu" parent="baseMenu"/>
-
-	<bean name="jobs" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/html/jobs.ftl</prop>
-				<prop key="titleCode">jobs.title</prop>
-				<prop key="titleText">Spring Batch Admin: Jobs</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/json/jobs.ftl</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/job" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/html/job.ftl</prop>
-				<prop key="titleCode">job.title</prop>
-				<prop key="titleText">Spring Batch Admin: Job Summary</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/job.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/json/job.ftl</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/html/executions.ftl</prop>
-				<prop key="feedPath">/jobs/executions.rss</prop>
-				<prop key="titleCode">job.executions.title</prop>
-				<prop key="titleText">Spring Batch Admin: Job Executions</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/json/executions.ftl</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions.rss" parent="standard.rss">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/rss/executions.ftl</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/execution" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/html/execution.ftl</prop>
-				<prop key="titleCode">job.execution.title</prop>
-				<prop key="titleText">Spring Batch Admin: Job Execution</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/execution.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/jobs/json/execution.ftl</prop>
-				<prop key="titleCode">job.execution.title</prop>
-				<prop key="titleText">Spring Batch Admin: Job Execution</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions/steps" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/steps/html/executions.ftl</prop>
-				<prop key="titleCode">step.executions.title</prop>
-				<prop key="titleText">Spring Batch Admin: Step Executions</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions/step" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/steps/html/execution.ftl</prop>
-				<prop key="titleCode">step.execution.title</prop>
-				<prop key="titleText">Spring Batch Admin: Step Execution Summary</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions/step.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/steps/json/execution.ftl</prop>
-				<prop key="titleCode">step.execution.title</prop>
-				<prop key="titleText">Spring Batch Admin: Step Execution</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions/step/history" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/steps/html/history.ftl</prop>
-				<prop key="titleCode">step.history.title</prop>
-				<prop key="titleText">Spring Batch Admin: Step Execution History</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="jobs/executions/step/progress" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/steps/html/progress.ftl</prop>
-				<prop key="history">/manager/steps/html/history.ftl</prop>
-				<prop key="execution">/manager/steps/html/execution.ftl</prop>
-				<prop key="titleCode">step.progress.title</prop>
-				<prop key="titleText">Spring Batch Admin: Step Execution Progress</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="redirect:files" class="org.springframework.web.servlet.view.RedirectView">
-		<property name="url" value="#{resourceService.servletPath}/files" />
-		<property name="contextRelative" value="true" />
-	</bean>
-
-	<bean name="files" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/files/html/files.ftl</prop>
-				<prop key="side">/manager/files/html/side.ftl</prop>
-				<prop key="titleCode">files.title</prop>
-				<prop key="titleText">Spring Batch Admin: Input File Uploads</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="files.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/files/json/files.ftl</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean name="configuration" parent="standard">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/manager/files/html/configuration.ftl</prop>
-				<prop key="side">/manager/files/html/side.ftl</prop>
-				<prop key="titleCode">configuration.title</prop>
-				<prop key="titleText">Spring Batch Admin: Job Configuration Upload</prop>
-			</props>
-		</property>
-	</bean>
-    <bean name="jobs/executions/execution-context.json" parent="standard.json">
-        <property name="attributes">
-            <props merge="true">
-                <prop key="body">/manager/jobs/json/executionContext.ftl</prop>
-                <prop key="titleCode">.execution.context.title</prop>
-                <prop key="titleText">Spring Batch Admin: Job Execution Context</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean name="jobs/executions/step/execution-context.json" parent="standard.json">
-        <property name="attributes">
-            <props merge="true">
-                <prop key="body">/manager/steps/json/executionContext.ftl</prop>
-                <prop key="titleCode">step.execution.context.title</prop>
-                <prop key="titleText">Spring Batch Admin: Step Execution Context</prop>
-            </props>
-        </property>
-    </bean>
-
-    <bean id="configurationHandler" name="/configuration" class="org.springframework.batch.admin.web.ViewHandler">
-        <property name="view" ref="configuration" />
-    </bean>
+	<!--<bean class="org.springframework.batch.admin.web.HomeMenu" parent="baseMenu"/>-->
+	<!--<bean class="org.springframework.batch.admin.web.JobsMenu" parent="baseMenu"/>-->
+	<!--<bean class="org.springframework.batch.admin.web.ExecutionsMenu" parent="baseMenu"/>-->
+	<!--<bean class="org.springframework.batch.admin.web.FilesMenu" parent="baseMenu"/>-->
+
+	<!--<bean name="jobs" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/html/jobs.ftl</prop>-->
+				<!--<prop key="titleCode">jobs.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Jobs</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/json/jobs.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/job" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/html/job.ftl</prop>-->
+				<!--<prop key="titleCode">job.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Job Summary</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/job.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/json/job.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/html/executions.ftl</prop>-->
+				<!--<prop key="feedPath">/jobs/executions.rss</prop>-->
+				<!--<prop key="titleCode">job.executions.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Job Executions</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/json/executions.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions.rss" parent="standard.rss">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/rss/executions.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/execution" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/html/execution.ftl</prop>-->
+				<!--<prop key="titleCode">job.execution.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Job Execution</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/execution.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/jobs/json/execution.ftl</prop>-->
+				<!--<prop key="titleCode">job.execution.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Job Execution</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions/steps" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/steps/html/executions.ftl</prop>-->
+				<!--<prop key="titleCode">step.executions.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Step Executions</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions/step" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/steps/html/execution.ftl</prop>-->
+				<!--<prop key="titleCode">step.execution.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Step Execution Summary</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions/step.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/steps/json/execution.ftl</prop>-->
+				<!--<prop key="titleCode">step.execution.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Step Execution</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions/step/history" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/steps/html/history.ftl</prop>-->
+				<!--<prop key="titleCode">step.history.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Step Execution History</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="jobs/executions/step/progress" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/steps/html/progress.ftl</prop>-->
+				<!--<prop key="history">/manager/steps/html/history.ftl</prop>-->
+				<!--<prop key="execution">/manager/steps/html/execution.ftl</prop>-->
+				<!--<prop key="titleCode">step.progress.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Step Execution Progress</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="redirect:files" class="org.springframework.web.servlet.view.RedirectView">-->
+		<!--<property name="url" value="#{resourceService.servletPath}/files" />-->
+		<!--<property name="contextRelative" value="true" />-->
+	<!--</bean>-->
+
+	<!--<bean name="files" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/files/html/files.ftl</prop>-->
+				<!--<prop key="side">/manager/files/html/side.ftl</prop>-->
+				<!--<prop key="titleCode">files.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Input File Uploads</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="files.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/files/json/files.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean name="configuration" parent="standard">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/manager/files/html/configuration.ftl</prop>-->
+				<!--<prop key="side">/manager/files/html/side.ftl</prop>-->
+				<!--<prop key="titleCode">configuration.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin: Job Configuration Upload</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+    <!--<bean name="jobs/executions/execution-context.json" parent="standard.json">-->
+        <!--<property name="attributes">-->
+            <!--<props merge="true">-->
+                <!--<prop key="body">/manager/jobs/json/executionContext.ftl</prop>-->
+                <!--<prop key="titleCode">.execution.context.title</prop>-->
+                <!--<prop key="titleText">Spring Batch Admin: Job Execution Context</prop>-->
+            <!--</props>-->
+        <!--</property>-->
+    <!--</bean>-->
+
+    <!--<bean name="jobs/executions/step/execution-context.json" parent="standard.json">-->
+        <!--<property name="attributes">-->
+            <!--<props merge="true">-->
+                <!--<prop key="body">/manager/steps/json/executionContext.ftl</prop>-->
+                <!--<prop key="titleCode">step.execution.context.title</prop>-->
+                <!--<prop key="titleText">Spring Batch Admin: Step Execution Context</prop>-->
+            <!--</props>-->
+        <!--</property>-->
+    <!--</bean>-->
+
+    <!--<bean id="configurationHandler" name="/configuration" class="org.springframework.batch.admin.web.ViewHandler">-->
+        <!--<property name="view" ref="configuration" />-->
+    <!--</bean>-->
 
 </beans>
 
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/configuration.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/configuration.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/configuration.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/configuration.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/files.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/files.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/files.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/files.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/side.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/side.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/html/side.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/html/side.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/json/files.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/json/files.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/files/json/files.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/files/json/files.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/html-resources.properties b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/html-resources.properties
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/html-resources.properties
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/html-resources.properties
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/execution.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/execution.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/execution.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/execution.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/executions.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/executions.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/executions.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/executions.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/job.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/job.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/job.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/job.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/jobs.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/jobs.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/jobs.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/jobs.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/launch.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/launch.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/html/launch.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/html/launch.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/execution.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/execution.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/execution.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executionContext.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/executionContext.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executionContext.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/executionContext.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/executions.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/executions.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/executions.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/job.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/job.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/job.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/job.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/jobs.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/jobs.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/json/jobs.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/json/jobs.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/rss/executions.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/rss/executions.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/jobs/rss/executions.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/jobs/rss/executions.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/json-resources.properties b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/json-resources.properties
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/json-resources.properties
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/json-resources.properties
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/execution.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/execution.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/execution.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/execution.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/executions.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/executions.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/executions.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/executions.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/history.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/history.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/history.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/history.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/progress.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/progress.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/html/progress.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/html/progress.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/json/execution.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/json/execution.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/json/execution.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/json/execution.ftl
diff --git a/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/json/executionContext.ftl b/spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/json/executionContext.ftl
similarity index 100%
rename from spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/manager/steps/json/executionContext.ftl
rename to spring-batch-admin-manager/src/main/resources/org/springframework/batch/admin/web/managerOld/steps/json/executionContext.ftl
diff --git a/spring-batch-admin-manager/src/test/java/org/springframework/batch/admin/web/server/JsonIntegrationTests.java b/spring-batch-admin-manager/src/test/java/org/springframework/batch/admin/web/server/JsonIntegrationTests.java
index fed1d8f8..734590ac 100644
--- a/spring-batch-admin-manager/src/test/java/org/springframework/batch/admin/web/server/JsonIntegrationTests.java
+++ b/spring-batch-admin-manager/src/test/java/org/springframework/batch/admin/web/server/JsonIntegrationTests.java
@@ -180,7 +180,7 @@ public void testListedResourcesWithGet() throws Exception {
 		RestTemplate template = new RestTemplate();
 
 		PropertiesFactoryBean propertiesFactoryBean = new PropertiesFactoryBean();
-		propertiesFactoryBean.setLocation(new ClassPathResource("/org/springframework/batch/admin/web/manager/json-resources.properties"));
+		propertiesFactoryBean.setLocation(new ClassPathResource("/org/springframework/batch/admin/web/managerOld/json-resources.properties"));
 		propertiesFactoryBean.afterPropertiesSet();
 		Properties properties = propertiesFactoryBean.getObject();
 
diff --git a/spring-batch-admin-resources/src/main/resources/META-INF/spring/batch/servlet/resources/resources-context.xml b/spring-batch-admin-resources/src/main/resources/META-INF/spring/batch/servlet/resources/resources-context.xml
index 8a5c72a9..45f0b0d8 100644
--- a/spring-batch-admin-resources/src/main/resources/META-INF/spring/batch/servlet/resources/resources-context.xml
+++ b/spring-batch-admin-resources/src/main/resources/META-INF/spring/batch/servlet/resources/resources-context.xml
@@ -79,102 +79,102 @@
 	<bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping" />
 
 	<!-- Support for Freemarker beans as views -->
-	<bean class="org.springframework.web.servlet.view.BeanNameViewResolver">
-		<property name="order">
-			<util:constant static-field="org.springframework.core.Ordered.HIGHEST_PRECEDENCE"/>
-		</property>
-	</bean>
+	<!--<bean class="org.springframework.web.servlet.view.BeanNameViewResolver">-->
+		<!--<property name="order">-->
+			<!--<util:constant static-field="org.springframework.core.Ordered.HIGHEST_PRECEDENCE"/>-->
+		<!--</property>-->
+	<!--</bean>-->
 
-	<bean id="baseMenu" abstract="true">
-		<property name="prefix" value="#{resourceService.servletPath}" />
-	</bean>
+	<!--<bean id="baseMenu" abstract="true">-->
+		<!--<property name="prefix" value="#{resourceService.servletPath}" />-->
+	<!--</bean>-->
 
-	<bean id="menuManager" class="org.springframework.batch.admin.web.resources.MenuManager" />
+	<!--<bean id="menuManager" class="org.springframework.batch.admin.web.resources.MenuManager" />-->
 
-	<bean class="org.springframework.batch.admin.web.util.HomeController">
-		<property name="defaultResources" ref="defaultResources" />
-		<property name="jsonResources" ref="jsonResources" />
-	</bean>
+	<!--<bean class="org.springframework.batch.admin.web.util.HomeController">-->
+		<!--<property name="defaultResources" ref="defaultResources" />-->
+		<!--<property name="jsonResources" ref="jsonResources" />-->
+	<!--</bean>-->
 
-	<util:properties id="defaultResources" />
-	<util:properties id="jsonResources" />
+	<!--<util:properties id="defaultResources" />-->
+	<!--<util:properties id="jsonResources" />-->
 
 	<!-- freemarker config -->
-	<bean id="freemarkerConfig" class="org.springframework.batch.admin.web.freemarker.HippyFreeMarkerConfigurer">
-		<property name="templateLoaderPaths" value="/WEB-INF/web,classpath:/org/springframework/batch/admin/web" />
-		<!-- TODO: find a way to switch this on for some template paths and not others -->
-		<property name="preferFileSystemAccess" value="false" />
-		<property name="freemarkerVariables">
-			<map>
-				<entry key="menuManager" value-ref="menuManager" />
-			</map>
-		</property>
-		<property name="freemarkerSettings">
-			<props>
-				<prop key="default_encoding">UTF-8</prop>
-				<prop key="output_encoding">UTF-8</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="parentLayout" class="org.springframework.batch.admin.web.freemarker.AjaxFreeMarkerView" abstract="true">
-		<property name="viewResolver">
-			<bean class="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver">
-				<property name="exposeSpringMacroHelpers" value="false" />
-				<property name="allowRequestOverride" value="true" />
-			</bean>
-		</property>
-		<property name="attributes">
-			<props merge="true">
-				<prop key="titleCode">home.title</prop>
-				<prop key="titleText">Spring Batch Admin</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="standard" parent="parentLayout">
-		<property name="url" value="/layouts/html/standard.ftl" />
-		<property name="contentType" value="text/html;charset=UTF-8" />
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/layouts/html/home.ftl</prop>
-				<!-- Matches the prefix of the servlet mapping in web.xml -->
-				<prop key="servletPath">#{resourceService.servletPath}</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="standard.rss" parent="parentLayout">
-		<property name="url" value="/layouts/rss/standard.ftl" />
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/layouts/rss/home.ftl</prop>
-				<!-- Matches the prefix of the servlet mapping in web.xml -->
-				<prop key="servletPath">#{resourceService.servletPath}</prop>
-			</props>
-		</property>
-		<property name="contentType" value="text/xml" />
-	</bean>
-
-	<bean id="standard.json" parent="parentLayout">
-		<property name="url" value="/layouts/json/standard.ftl" />
-		<property name="attributes">
-			<props merge="true">
-				<!-- Matches the prefix of the servlet mapping in web.xml -->
-				<prop key="servletPath">#{resourceService.servletPath}</prop>
-			</props>
-		</property>
-		<property name="contentType" value="application/json" />
-	</bean>
-
-	<bean id="home" parent="standard" />
-
-	<bean id="home.json" parent="standard.json">
-		<property name="attributes">
-			<props merge="true">
-				<prop key="body">/layouts/json/home.ftl</prop>
-			</props>
-		</property>
-	</bean>
+	<!--<bean id="freemarkerConfig" class="org.springframework.batch.admin.web.freemarker.HippyFreeMarkerConfigurer">-->
+		<!--<property name="templateLoaderPaths" value="/WEB-INF/web,classpath:/org/springframework/batch/admin/web" />-->
+		<!--&lt;!&ndash; TODO: find a way to switch this on for some template paths and not others &ndash;&gt;-->
+		<!--<property name="preferFileSystemAccess" value="false" />-->
+		<!--<property name="freemarkerVariables">-->
+			<!--<map>-->
+				<!--<entry key="menuManager" value-ref="menuManager" />-->
+			<!--</map>-->
+		<!--</property>-->
+		<!--<property name="freemarkerSettings">-->
+			<!--<props>-->
+				<!--<prop key="default_encoding">UTF-8</prop>-->
+				<!--<prop key="output_encoding">UTF-8</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean id="parentLayout" class="org.springframework.batch.admin.web.freemarker.AjaxFreeMarkerView" abstract="true">-->
+		<!--<property name="viewResolver">-->
+			<!--<bean class="org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver">-->
+				<!--<property name="exposeSpringMacroHelpers" value="false" />-->
+				<!--<property name="allowRequestOverride" value="true" />-->
+			<!--</bean>-->
+		<!--</property>-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="titleCode">home.title</prop>-->
+				<!--<prop key="titleText">Spring Batch Admin</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean id="standard" parent="parentLayout">-->
+		<!--<property name="url" value="/layouts/html/standard.ftl" />-->
+		<!--<property name="contentType" value="text/html;charset=UTF-8" />-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/layouts/html/home.ftl</prop>-->
+				<!--&lt;!&ndash; Matches the prefix of the servlet mapping in web.xml &ndash;&gt;-->
+				<!--<prop key="servletPath">#{resourceService.servletPath}</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
+
+	<!--<bean id="standard.rss" parent="parentLayout">-->
+		<!--<property name="url" value="/layouts/rss/standard.ftl" />-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/layouts/rss/home.ftl</prop>-->
+				<!--&lt;!&ndash; Matches the prefix of the servlet mapping in web.xml &ndash;&gt;-->
+				<!--<prop key="servletPath">#{resourceService.servletPath}</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+		<!--<property name="contentType" value="text/xml" />-->
+	<!--</bean>-->
+
+	<!--<bean id="standard.json" parent="parentLayout">-->
+		<!--<property name="url" value="/layouts/json/standard.ftl" />-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--&lt;!&ndash; Matches the prefix of the servlet mapping in web.xml &ndash;&gt;-->
+				<!--<prop key="servletPath">#{resourceService.servletPath}</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+		<!--<property name="contentType" value="application/json" />-->
+	<!--</bean>-->
+
+	<!--<bean id="home" parent="standard" />-->
+
+	<!--<bean id="home.json" parent="standard.json">-->
+		<!--<property name="attributes">-->
+			<!--<props merge="true">-->
+				<!--<prop key="body">/layouts/json/home.ftl</prop>-->
+			<!--</props>-->
+		<!--</property>-->
+	<!--</bean>-->
 
 </beans>