Sorted out project stucture to be mavenlike