Refactor into Maven
Commit