Folder Reformat

Reformatting how and what is included in each folder