Moving things around in the project a bit.