Move things into folders to keep it neat