Organized the files for easier scripting.