Changed structure for Maven