Added directory structure and refactored for classpath changes