Refactoring to better match Maven conventions