Make the project more maven