made component editing work
some renames and moves