Updates to Folder Structure and Stuff