Changed the project around a little