Reformated project structure to adhere to maven project template

Hope that helped