Reordered the folders to make more sense.