Suspend feature header; finishe maven setup first
Another maven refactoring