Reworked the project to only be a maven project