Fix maven project structure