Creation and removal of root folders now separated