Change context model.
Organize package structure.
Correct context's lifecycle.