Refactored build to maven