Refactored maven repo