rename folders to make more sense