Fixed Project setup.

I was having issues with the project setup, these are the changes I made in order to get them to work for me, pull them or not, depending on if you are having maven issues or whether it works for you.