Moved more files into subfolders.