folder structure changed again