MOV: Moved context information into its own package