complete the move
wrapper frameworks also need controllers as they still are in the framework instances list
removing old watcher code