Moved files to correct subdirs