Did folder restructure