More of json_dir to context_dir rename, #24.