Changed project structure to maven