Removed old folders.
Added back in files with new folder names.