Fixed maven compilation and cleaned up the project