Moved the files (back) into the correct subdirs.