refactoring to use Maven