Restructure and add dummy manage views
Restructure and add views. Add context parameter.
Improve stubs
Merge