Finished migrating to the better directory structure.