Rearrange Folders

I just rearranged the folders to mimic Rob's structure.