fixing folder structure (again)