Reorganizing basic structure to meet Maven typical organization