Refactored Maven assembly