Added directory structure and refactored for classpath changes
Merge pull request #1 from anagran/master

Added directory structure and refactored for classpath changes