Revised imports
Refactored some code to match common Java architectural best practices
Moved app-specific code to respective projects