Update project structure with Maven / JUnit