Moving things around to the new project structure format.