Made changes to folder substructure