Cleaning up, consolidating files.