Updated file structure
Made the project use Maven