Initial refactoring and work switching to my pom.xml, updated classes and new commands.