mass "move types into matching files"