Modified project structure

Modified project structure to match Maven best practise