More root dir cleanup