Changed project structure for maven