Move to maven structure
Move to maven structure - add packages
Move to maven structure - add packages
Removal of moved files/classes