folder and event tidying