Folder structure put in place