Refactored maven scripts