Moved files around for cleanup purposes.