Move things into the right subdirs