Refactor: Mode classes renamed into Context