Moved context package to correct subfolder