refactored maven structure