Fixing Maven build: moving sources under src/main/java