Now removes old thangs from folder structure, but collapses folders each time