Mavenization phase 1 - Project structure made to match maven convention