Refactoring to better match Maven conventions, part 2