refactoring the maven repo