Purge package to accept refactored content [ci skip]
Update context factory to accept refactored design (breaks build)