Removed unused imports
Split out into separate java package
Rearranged classes into separate packages based on functional areas