Reworked the project so it would be git friendly, I hope