redo of project structure
new maven structure