Folder Reorganization

Oh God wheyey - vid