Housekeeping & Folder structure changes