Moved files around a bit in the project.