some renames and moving around