#global: generator-settings moved, layout folder removed and few files moved/removed or renamed