some renaming
more moving
update templates
cleanup after trying and removing: