Re-ordering of folders

Trying to reorder things just to make organization a little easier.