Move some things into folders.