Changed directory structure to start using maven