Update project structure for maven