Part 1 and 2 Complete, Folders moved back to their proper place