Maven restructuring
Reverting maven restructure