more refactoring, including moving app context files to the classpath