Changed the project around a bit.