Switched the code to Maven