moved routs up for detangle
some renames