Moved java files into self-contained directory
Minor refactoring and fixes
Merge branch 'feature/project_reorganization' into develop