Move some files around to more logical places.