First pass at refactoring to maven