diff --git a/.gitignore b/.gitignore
index 1d8e315b..5d501780 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@ etc/Makefile
 example/Makefile
 lib/Makefile
 lib/*/Makefile
+yang/Makefile
+yang/*/Makefile
 autom4te.cache/
 
 config.log
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5694ce..2a2802e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -81,10 +81,13 @@
   * Recovery user "_nacm_recovery" added.
     * Example use is restconf PUT when NACM edit-config is permitted, then automatic commit and discard are permitted using recovery user.
   * Example user changed adm1 to andy to comply with RFC8341 example
-* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
-  * Any config option from file can be overrided by giving them on command-line.
 	
 ### API changes on existing features (you may need to change your code)
+* Moved and updated all standard ietf and iana yang files from example and yang/ to `yang/standard`.
+  * To turn off install of standard yang file: `./configure --disable-stdyangs`
+  * This is to make it easier to use standard IETF/IANA yang files
+* Renamed example yang from example.yang -> clixon-example.yang
+* clixon_cli -p (printspec) changed semantics to add new yang path dir (see minor changes).
 * Date-and-time type now properly uses ISO 8601 UTC timezone designators.
   * Eg 2008-09-21T18:57:21.003456 is changed to 2008-09-21T18:57:21.003456Z
 * Renamed yang file `ietf-netconf-notification@2008-07-01.yang` to `clixon-rfc5277`.
@@ -107,6 +110,10 @@
   * For backward compatibility, define CLICON_CLI_MODEL_TREENAME_PATCH in clixon_custom.h
 
 ### Minor changes
+* Added -o "<option>=<value>" command-line option to all programs: backend, cli, netconf, restconf.
+  * Any config option from file can be overrided by giving them on command-line.
+* Added -p <dir> command-line option to all programs: backend, cli, netconf, restconf.
+  * -p adds a new dir to the yang path dir. (same as -o CLICON_YAN_DIR=<dir>)
 * Cligen uses posix regex while yang uses XSD. It differs in some aspects. A translator function has been added for `\d` -> `[0-9]` translation, there may be more.
 * Added new clixon-lib yang module for internal netconf protocol. Currently only extends the standard with a debug RPC.
 * Added three-valued return values for several validate functions where -1 is fatal error, 0 is validation failed and 1 is validation OK.
diff --git a/README.md b/README.md
index ac3c7fd1..215ac2ea 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ NETCONF and RESTCONF interfaces, an embedded database and transaction
 support.
 
   * [Background](#background)
-  * [Frequently asked questions](doc/FAQ.md)
+  * [Frequently asked questions (FAQ)](doc/FAQ.md)
   * [Installation](#installation)
   * [Licenses](#licenses)
   * [Support](#support)
diff --git a/apps/Makefile.in b/apps/Makefile.in
index d8125aa0..b6513757 100644
--- a/apps/Makefile.in
+++ b/apps/Makefile.in
@@ -44,6 +44,7 @@ SHELL	= /bin/sh
 SUBDIRS  = backend
 SUBDIRS += cli
 SUBDIRS += netconf
+# See configure.ac
 ifeq ($(with_restconf),yes)
 SUBDIRS += restconf
 endif
diff --git a/apps/backend/backend_main.c b/apps/backend/backend_main.c
index 5fbfd6e8..c6a835fe 100644
--- a/apps/backend/backend_main.c
+++ b/apps/backend/backend_main.c
@@ -73,7 +73,7 @@
 #include "backend_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define BACKEND_OPTS "hD:f:l:d:b:Fza:u:P:1s:c:g:y:x:o:" 
+#define BACKEND_OPTS "hD:f:l:d:p:b:Fza:u:P:1s:c:g:y:x:o:" 
 
 #define BACKEND_LOGFILE "/usr/local/var/clixon_backend.log"
 
@@ -142,6 +142,7 @@ usage(clicon_handle h,
     	    "\t-f <file>\tCLICON config file\n"
 	    "\t-l (s|e|o|f<file>)  Log on (s)yslog, std(e)rr or std(o)ut (stderr is default) Only valid if -F, if background syslog is on syslog.\n"
 	    "\t-d <dir>\tSpecify backend plugin directory (default: %s)\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-b <dir>\tSpecify XMLDB database directory\n"
     	    "\t-F\t\tRun in foreground, do not run as daemon\n"
     	    "\t-z\t\tKill other config daemon and exit\n"
@@ -654,12 +655,18 @@ main(int    argc,
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_BACKEND_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_BACKEND_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'b':  /* XMLDB database directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_XMLDB_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_XMLDB_DIR", optarg) < 0)
+		goto done;
+	    break;
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'F' : /* foreground */
 	    foreground = 1;
@@ -668,21 +675,25 @@ main(int    argc,
 	    zap++;
 	    break;
 	case 'a': /* internal backend socket address family */
-	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_FAMILY", optarg) < 0)
+		goto done;
 	    break;
 	case 'u': /* config unix domain path / ip address */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK", optarg) < 0)
+		goto done;
 	    break;
 	case 'P': /* pidfile */
-	    clicon_option_str_set(h, "CLICON_BACKEND_PIDFILE", optarg);
+	    if (clicon_option_add(h, "CLICON_BACKEND_PIDFILE", optarg) < 0)
+		goto done;
 	    break;
 	case '1' : /* Quit after reading database once - dont wait for events */
 	    once = 1;
 	    break;
 	case 's' : /* startup mode */
-	    clicon_option_str_set(h, "CLICON_STARTUP_MODE", optarg);
+	    if (clicon_option_add(h, "CLICON_STARTUP_MODE", optarg) < 0)
+		goto done;
 	    if (clicon_startup_mode(h) < 0){
 		fprintf(stderr, "Invalid startup mode: %s\n", optarg);
 		usage(h, argv[0]);
@@ -692,16 +703,17 @@ main(int    argc,
 	    extraxml_file = optarg;
 	    break;
 	case 'g': /* config socket group */
-	    clicon_option_str_set(h, "CLICON_SOCK_GROUP", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_GROUP", optarg) < 0)
+		goto done;
 	    break;
-	case 'y' :{ /* Load yang absolute filename */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'y' : /* Load yang absolute filename */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
-	case 'x' :{ /* xmldb plugin */
-	    clicon_option_str_set(h, "CLICON_XMLDB_PLUGIN", optarg);
+	case 'x' : /* xmldb plugin */
+	    if (clicon_option_add(h, "CLICON_XMLDB_PLUGIN", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'o':{ /* Configuration option */
 	    char          *val;
 	    if ((val = index(optarg, '=')) == NULL)
diff --git a/apps/cli/cli_main.c b/apps/cli/cli_main.c
index deeafd29..0cbafccd 100644
--- a/apps/cli/cli_main.c
+++ b/apps/cli/cli_main.c
@@ -71,7 +71,7 @@
 #include "cli_handle.h"
 
 /* Command line options to be passed to getopt(3) */
-#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qpGLy:c:U:o:"
+#define CLI_OPTS "hD:f:xl:F:1a:u:d:m:qp:GLy:c:U:o:"
 
 #define CLI_LOGFILE "/tmp/clixon_cli.log"
 
@@ -221,7 +221,7 @@ usage(clicon_handle h,
 	    "\t-d <dir>\tSpecify plugin directory (default: %s)\n"
             "\t-m <mode>\tSpecify plugin syntax mode\n"
 	    "\t-q \t\tQuiet mode, dont print greetings or prompt, terminate on ctrl-C\n"
-	    "\t-p \t\tPrint database yang specification\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-G \t\tPrint CLI syntax generated from dbspec (if CLICON_CLI_GENMODEL enabled)\n"
 	    "\t-L \t\tDebug print dynamic CLI syntax including completions and expansions\n"
 	    "\t-l <s|e|o|f<file>> \tLog on (s)yslog, std(e)rr, std(o)ut or (f)ile (stderr is default)\n"
@@ -246,7 +246,6 @@ main(int argc, char **argv)
     char	*tmp;
     char	*argv0 = argv[0];
     clicon_handle h;
-    int          printspec = 0;
     int          printgen  = 0;
     int          logclisyntax  = 0;
     int          help = 0;
@@ -361,28 +360,33 @@ main(int argc, char **argv)
 	    once = 1;
 	    break;
 	case 'a': /* internal backend socket address family */
-	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK_FAMILY", optarg) < 0)
+		goto done;
 	    break;
 	case 'u': /* internal backend socket unix domain path or ip host */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
+	    if (clicon_option_add(h, "CLICON_SOCK", optarg) < 0)
+		goto done;
 	    break;
 	case 'd':  /* Plugin directory: overrides configfile */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_CLI_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_CLI_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'm': /* CLI syntax mode */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_CLI_MODE", optarg);
+	    if (clicon_option_add(h, "CLICON_CLI_MODE", optarg) < 0)
+		goto done;
 	    break;
 	case 'q' : /* Quiet mode */
 	    clicon_quiet_mode_set(h, 1);
 	    break;
-	case 'p' : /* Print spec */
-	    printspec++;
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
 	    break;
 	case 'G' : /* Print generated CLI syntax */
 	    printgen++;
@@ -390,14 +394,14 @@ main(int argc, char **argv)
 	case 'L' : /* Debug print dynamic CLI syntax */
 	    logclisyntax++;
 	    break;
-	case 'y' :{ /* Load yang absolute filename */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'y' : /* Load yang absolute filename */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
-	case 'c' :{ /* Overwrite clispec with absolute filename */
-	    clicon_option_str_set(h, "CLICON_CLISPEC_FILE", optarg);
+	case 'c' : /* Overwrite clispec with absolute filename */
+	    if (clicon_option_add(h, "CLICON_CLISPEC_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'U': /* Clixon 'pseudo' user */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
@@ -463,8 +467,6 @@ main(int argc, char **argv)
      /* Load yang module library, RFC7895 */
     if (yang_modules_init(h) < 0)
 	goto done;
-    if (printspec)
-	yang_print(stdout, (yang_node*)yspec);
 
     /* Create tree generated from dataspec. If no other trees exists, this is
      * the only one.
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index b3fd3a22..b6c1e930 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -71,7 +71,7 @@
 #include "netconf_rpc.h"
 
 /* Command line options to be passed to getopt(3) */
-#define NETCONF_OPTS "hD:f:l:qa:u:d:y:U:t:o:"
+#define NETCONF_OPTS "hD:f:l:qa:u:d:p:y:U:t:o:"
 
 #define NETCONF_LOGFILE "/tmp/clixon_netconf.log"
 
@@ -324,13 +324,13 @@ usage(clicon_handle h,
 	    "where options are\n"
             "\t-h\t\tHelp\n"
 	    "\t-D <level>\tDebug level\n"
-            "\t-q\t\tQuiet: dont send hello prompt\n"
     	    "\t-f <file>\tConfiguration file (mandatory)\n"
 	    "\t-l (e|o|s|f<file>) \tLog on std(e)rr, std(o)ut, (s)yslog, (f)ile (syslog is default)\n"
+            "\t-q\t\tQuiet: dont send hello prompt\n"
     	    "\t-a UNIX|IPv4|IPv6\tInternal backend socket family\n"
     	    "\t-u <path|addr>\tInternal socket domain path or IP addr (see -a)\n"
 	    "\t-d <dir>\tSpecify netconf plugin directory dir (default: %s)\n"
-
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
 	    "\t-U <user>\tOver-ride unix user with a pseudo user for NACM.\n"
 	    "\t-t <sec>\tTimeout in seconds. Quit after this time.\n"
@@ -418,6 +418,9 @@ main(int    argc,
 	case 'f':  /* config file */
 	case 'l':  /* log  */
 	    break; /* see above */
+	case 'q':  /* quiet: dont write hello */
+	    quiet++;
+	    break;
 	case 'a': /* internal backend socket address family */
 	    clicon_option_str_set(h, "CLICON_SOCK_FAMILY", optarg);
 	    break;
@@ -426,18 +429,20 @@ main(int    argc,
 		usage(h, argv[0]);
 	    clicon_option_str_set(h, "CLICON_SOCK", optarg);
 	    break;
-	case 'q':  /* quiet: dont write hello */
-	    quiet++;
-	    break;
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
-	    clicon_option_str_set(h, "CLICON_NETCONF_DIR", optarg);
+	    if (clicon_option_add(h, "CLICON_NETCONF_DIR", optarg) < 0)
+		goto done;
 	    break;
-	case 'y' :{ /* Load yang spec file (override yang main module) */
-	    clicon_option_str_set(h, "CLICON_YANG_MAIN_FILE", optarg);
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
+	    break;
+	case 'y' : /* Load yang spec file (override yang main module) */
+	    if (clicon_option_add(h, "CLICON_YANG_MAIN_FILE", optarg) < 0)
+		goto done;
 	    break;
-	}
 	case 'U': /* Clixon 'pseudo' user */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
diff --git a/apps/restconf/restconf_main.c b/apps/restconf/restconf_main.c
index c92a2ff1..d83f1a27 100644
--- a/apps/restconf/restconf_main.c
+++ b/apps/restconf/restconf_main.c
@@ -81,7 +81,7 @@
 #include "restconf_stream.h"
 
 /* Command line options to be passed to getopt(3) */
-#define RESTCONF_OPTS "hD:f:l:p:y:a:u:o:"
+#define RESTCONF_OPTS "hD:f:l:p:d:y:a:u:o:"
 
 /* RESTCONF enables deployments to specify where the RESTCONF API is 
    located.  The client discovers this by getting the "/.well-known/host-meta"
@@ -492,6 +492,7 @@ usage(clicon_handle h,
 	    "\t-D <level>\tDebug level\n"
     	    "\t-f <file>\tConfiguration file (mandatory)\n"
 	    "\t-l <s|f<file>> \tLog on (s)yslog, (f)ile (syslog is default)\n"
+	    "\t-p <dir>\tYang directory path (see CLICON_YANG_DIR)\n"
 	    "\t-d <dir>\tSpecify restconf plugin directory dir (default: %s)\n"
 	    "\t-y <file>\tLoad yang spec file (override yang main module)\n"
     	    "\t-a UNIX|IPv4|IPv6\tInternal backend socket family\n"
@@ -596,6 +597,10 @@ main(int    argc,
 	case 'f':  /* config file */
 	case 'l':  /* log  */
 	    break; /* see above */
+	case 'p' : /* yang dir path */
+	    if (clicon_option_add(h, "CLICON_YANG_DIR", optarg) < 0)
+		goto done;
+	    break;
 	case 'd':  /* Plugin directory */
 	    if (!strlen(optarg))
 		usage(h, argv[0]);
diff --git a/apps/restconf/restconf_methods.c b/apps/restconf/restconf_methods.c
index 58980589..754592c9 100644
--- a/apps/restconf/restconf_methods.c
+++ b/apps/restconf/restconf_methods.c
@@ -270,8 +270,17 @@ api_data_get2(clicon_handle h,
 	}
     }
     else{
-	if (xpath_vec(xret, "%s", &xvec, &xlen, path) < 0)
-	    goto done;
+	if (xpath_vec(xret, "%s", &xvec, &xlen, path) < 0){
+	    if (netconf_operation_failed_xml(&xerr, "application", clicon_err_reason) < 0)
+		goto done;
+	    if ((xe = xpath_first(xerr, "rpc-error")) == NULL){
+		clicon_err(OE_XML, EINVAL, "rpc-error not found (internal error)");
+		goto done;
+	    }
+	    if (api_return_err(h, r, xe, pretty, use_xml) < 0)
+		goto done;
+	    goto ok;
+	}
 	if (use_xml){
 	    for (i=0; i<xlen; i++){
 		char *prefix, *namespace;
@@ -302,6 +311,7 @@ api_data_get2(clicon_handle h,
     FCGX_FPrintF(r->out, "\r\n");
     FCGX_FPrintF(r->out, "%s", cbx?cbuf_get(cbx):"");
     FCGX_FPrintF(r->out, "\r\n\r\n");
+    clicon_debug(1, "%s Z", __FUNCTION__);
  ok:
     retval = 0;
  done:
diff --git a/configure b/configure
index 7eba05ec..a5767406 100755
--- a/configure
+++ b/configure
@@ -635,6 +635,7 @@ EXEEXT
 ac_ct_CC
 wwwuser
 wwwdir
+enable_stdyangs
 with_restconf
 RANLIB
 SH_SUFFIX
@@ -711,6 +712,7 @@ ac_user_opts='
 enable_option_checking
 enable_debug
 with_cligen
+enable_stdyangs
 enable_publish
 with_restconf
 with_configfile
@@ -1350,6 +1352,8 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-debug          Build with debug symbols, default: no
+  --disable-stdyangs      Include standard yang files in clixon install,
+                          default: yes
   --enable-publish        Enable publish of notification streams using SSE and
                           curl
 
@@ -2457,6 +2461,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
  # If yes, compile apps/restconf
+
 wwwdir=/www-data
 
 wwwuser=www-data
@@ -3691,6 +3696,26 @@ if test "${with_cligen}"; then
   test -d "$with_cligen" && CLIGEN_PREFIX="$with_cligen"
 fi
 
+# Disable/enable standard Yang files.
+# If enable - include yang/standard/*.yang in clixon yang files (default)
+# If disable - get standard yang files from elsewhere
+# Check whether --enable-stdyangs was given.
+if test "${enable_stdyangs+set}" = set; then :
+  enableval=$enable_stdyangs;
+	  if test "$enableval" = no; then
+	      enable_stdyangs=no
+	  else
+	      enable_stdyangs=yes
+          fi
+
+else
+   enable_stdyangs=yes
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: stdyangs is $enable_stdyangs" >&5
+$as_echo "stdyangs is $enable_stdyangs" >&6; }
+
 # Experimental: Curl publish notification stream to eg Nginx nchan.
 # Check whether --enable-publish was given.
 if test "${enable_publish+set}" = set; then :
@@ -4408,7 +4433,7 @@ _ACEOF
 
 
 
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile doc/Makefile"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile extras/rpm/Makefile docker/Makefile datastore/Makefile datastore/text/Makefile util/Makefile yang/Makefile yang/clixon/Makefile yang/standard/Makefile doc/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5121,6 +5146,8 @@ do
     "datastore/text/Makefile") CONFIG_FILES="$CONFIG_FILES datastore/text/Makefile" ;;
     "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;;
     "yang/Makefile") CONFIG_FILES="$CONFIG_FILES yang/Makefile" ;;
+    "yang/clixon/Makefile") CONFIG_FILES="$CONFIG_FILES yang/clixon/Makefile" ;;
+    "yang/standard/Makefile") CONFIG_FILES="$CONFIG_FILES yang/standard/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
diff --git a/configure.ac b/configure.ac
index 94710961..f6aa83e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,7 @@ AC_SUBST(LIBS)
 AC_SUBST(SH_SUFFIX)
 AC_SUBST(RANLIB)
 AC_SUBST(with_restconf) # If yes, compile apps/restconf
+AC_SUBST(enable_stdyangs) 
 AC_SUBST(wwwdir,/www-data)
 AC_SUBST(wwwuser,www-data)
 #
@@ -145,6 +146,20 @@ if test "${with_cligen}"; then
   test -d "$with_cligen" && CLIGEN_PREFIX="$with_cligen"
 fi
 
+# Disable/enable standard Yang files.
+# If enable - include yang/standard/*.yang in clixon yang files (default)
+# If disable - get standard yang files from elsewhere
+AC_ARG_ENABLE(stdyangs, AS_HELP_STRING([--disable-stdyangs],[Include standard yang files in clixon install, default: yes]),[
+	  if test "$enableval" = no; then
+	      enable_stdyangs=no
+	  else	      
+	      enable_stdyangs=yes
+          fi
+        ],
+	[ enable_stdyangs=yes])
+
+AC_MSG_RESULT(stdyangs is $enable_stdyangs)	
+
 # Experimental: Curl publish notification stream to eg Nginx nchan. 
 AC_ARG_ENABLE(publish, AS_HELP_STRING([--enable-publish],[Enable publish of notification streams using SSE and curl]),[
 	  if test "$enableval" = no; then
@@ -231,6 +246,8 @@ AC_OUTPUT(Makefile
 	  datastore/text/Makefile
   	  util/Makefile 
 	  yang/Makefile
+  	  yang/clixon/Makefile
+  	  yang/standard/Makefile
 	  doc/Makefile
 )
 
diff --git a/doc/FAQ.md b/doc/FAQ.md
index ff49df1a..1677ad7b 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -137,8 +137,12 @@ Start nginx daemon
 ```
 sudo /etc/init.d/nginx start
 ```
+Start the clixon restconf daemon
+```
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
+```
 
-Example:
+Then acess:
 ```
    curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces/interface=eth9/type
    [
@@ -147,7 +151,7 @@ Example:
      }
    ]
 ```
-Read more in the (restconf)[../apps/restconf] docs.
+Read more in the [restconf](../apps/restconf) docs.
 ## What about reference documentation?
 Clixon uses [Doxygen](http://www.doxygen.nl/index.html) for reference documentation.
 You need to install doxygen and graphviz on your system.
@@ -188,6 +192,15 @@ Clixon by default finds its configuration file at `/usr/local/etc/clixon.xml`. H
   - Provide --sysconfig=<dir> when configuring. Then FILE is <dir>/etc/clixon.xml
   - FILE is /usr/local/etc/clixon.xml
 
+## Can I modify clixon options at runtime?
+
+Yes, when you start a clixon program, you can supply the `-o` option to modify the configuration specified in the configuration file. Options that are leafs are overriden, whereas options that are leaf-lists are added to.
+
+Example, add the "usr/local/share/ietf" directory to the list of directories where yang files are searched for:
+```
+  clixon_cli -o CLICON_YANG_DIR=/usr/local/share/ietf
+```
+
 ## How are Yang files found?
 
 Yang files contain the configuration specification. A Clixon
@@ -404,7 +417,7 @@ Please look at the example for an example on how to write a state data callback.
 
 A YANG RPC is an application specific operation. Example:
 ```
-   rpc fib-route {
+   rpc example-rpc {
       input {
          leaf inarg { type string; }
       }
@@ -413,7 +426,7 @@ A YANG RPC is an application specific operation. Example:
       }
    }
 ```
-which defines the fib-route operation present in the example (the arguments have been changed).
+which defines the example-rpc operation present in the example (the arguments have been changed).
 
 Clixon automatically relays the RPC to the clixon backend. To
 implement the RFC, you need to register an RPC callback in the backend plugin:
@@ -423,18 +436,18 @@ int
 clixon_plugin_init(clicon_handle h)
 {
 ...
-   rpc_callback_register(h, fib_route, NULL, "fib-route");
+   rpc_callback_register(h, example_rpc, NULL, "example-rpc");
 ...
 }
 ```
 And then define the callback itself:
 ```
 static int 
-fib_route(clicon_handle h,            /* Clicon handle */
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
+example_rpc(clicon_handle h,            /* Clicon handle */
+	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	    void         *arg,          /* Client session */
+	    void         *regarg)       /* Argument given at register */
 {
     cprintf(cbret, "<rpc-reply><ok/></rpc-reply>");    
     return 0;
diff --git a/example/Makefile.in b/example/Makefile.in
index 8e18d3ea..e4e60549 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -43,6 +43,8 @@ localstatedir   = @localstatedir@
 libdir          = @exec_prefix@/lib
 
 APPNAME	        = example
+# Here is where example yang appears
+CLIXON_DATADIR  = @CLIXON_DATADIR@
 # Install here if you want default clixon location:
 CLIXON_DEFAULT_CONFIG = @CLIXON_DEFAULT_CONFIG@
 
@@ -70,16 +72,7 @@ all:	$(PLUGINS)
 
 CLISPECS = $(APPNAME)_cli.cli
 
-YANGSPECS	 = $(APPNAME).yang
-YANGSPECS	+= ietf-yang-types@2013-07-15.yang
-YANGSPECS	+= ietf-inet-types@2013-07-15.yang
-YANGSPECS	+= ietf-interfaces@2014-05-08.yang
-YANGSPECS	+= ietf-ip@2014-06-16.yang
-YANGSPECS	+= ietf-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipv4-unicast-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipv6-unicast-routing@2014-10-26.yang
-YANGSPECS	+= ietf-ipsec@2016-03-09.yang
-YANGSPECS	+= iana-if-type@2014-05-08.yang
+YANGSPECS	 = clixon-example@2019-01-13.yang
 
 # Backend plugin
 BE_SRC   = $(APPNAME)_backend.c
@@ -125,7 +118,7 @@ install: $(YANGSPECS) $(CLISPECS) $(BE_PLUGIN) $(BE2_PLUGIN) $(CLI_PLUGIN) $(NET
 	install -m 0644 $(APPNAME).xml $(DESTDIR)$(sysconfdir)
 #	install -m 0644 $(APPNAME).xml $(DESTDIR)$(CLIXON_DEFAULT_CONFIG)
 	install -d -m 0755 $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
-	install -m 0644 $(YANGSPECS) $(DESTDIR)$(datarootdir)/$(APPNAME)/yang
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(DESTDIR)$(CLIXON_DATADIR)
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/cli
 	install -m 0644 $(INSTALLFLAGS) $(CLI_PLUGIN) $(DESTDIR)$(libdir)/$(APPNAME)/cli
 	install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/backend
diff --git a/example/README.md b/example/README.md
index a0a1d621..8e9c61f0 100644
--- a/example/README.md
+++ b/example/README.md
@@ -16,9 +16,9 @@
 
 This directory contains a Clixon example which includes a simple example. It contains the following files:
 * `example.xml`       The configuration file. See (yang/clixon-config@<date>.yang)[../yang/clixon-config@2018-10-21.yang] for the documentation of all available fields.
-* `example.yang`      The yang spec of the example. It mainly includes ietf routing and IP modules.
+* `clixon-example@2019-01-13.yang`      The yang spec of the example.
 * `example_cli.cli`   CLIgen specification.
-* `example_cli.c`     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an RPC (`fib_route_rpc`).
+* `example_cli.c`     CLI callback plugin containing functions called in the cli file above: a generic callback (`mycallback`) and an example RPC call (`example_client_rpc`).
 * `example_backend.c` Backend callback plugin including example of:
   * transaction callbacks (validate/commit),
   * notification,
@@ -115,6 +115,31 @@ The following example shows how to set data using netconf:
 <rpc><get-config><source><candidate/></source><filter type="xpath" select="/interfaces/interface"/></get-config></rpc>]]>]]>
 <rpc><validate><source><candidate/></source></validate></rpc>]]>]]>
 ```
+## Restconf
+
+Setup a web/reverse-proxy server.
+For example, using nginx, install, and edit config file: /etc/nginx/sites-available/default:
+```
+server {
+  ...
+  location /restconf {
+    fastcgi_pass unix:/www-data/fastcgi_restconf.sock;
+    include fastcgi_params;
+  }
+}
+```
+Start nginx daemon
+```
+sudo /etc/init.d/nginx start
+```
+Start the clixon restconf daemon
+```
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data
+```
+then access using curl or wget:
+```
+   curl -G http://127.0.0.1/restconf/data/ietf-interfaces:interfaces/interface=eth9/type
+```
 
 ## Streams
 
@@ -153,52 +178,59 @@ independent of the yang rpc construct, but it is recommended. The example includ
 
 Example using CLI:
 ```
+clixon_cli -f /usr/local/etc/example.xml
 cli> rpc ipv4
-    rpc-reply {
-        route {
-            address-family ipv4;
-            next-hop {
-                next-hop-list 2.3.4.5;
-            }
-            source-protocol static;
-        }
-    }
+<rpc-reply><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>
 ```
-Netconf:
+Example using Netconf:
 ```
-<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name></fib-route></rpc>]]>]]>
-<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></rpc-reply>]]>]]>
+clixon_netconf -qf /usr/local/etc/example.xml
+<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><example xmlns="urn:example:clixon"><x>ipv4</x></example></rpc>]]>]]>
+<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>
 ```
-Restconf:
+Restconf (assuming nginx started):
 ```
-curl -X POST  http://localhost/restconf/operations/ietf-routing:fib-route -d '{"ietf-routing:input":{"routing-instance-name":"ipv4"}}'
+sudo su -c "/www-data/clixon_restconf -f /usr/local/etc/example.xml " -s /bin/sh www-data&
+curl -X POST  http://localhost/restconf/operations/clixon-example:example -d '{"clixon-example:input":{"x":"ipv4"}}'
+{
+  "clixon-example:output": {
+    "x": "ipv4",
+    "y": "42"
+  }
+}
 ```
 
 ### Details
 
-The example works by creating a netconf rpc call and sending it to the backend: (see the fib_route_rpc() function in [example_cli.c](example_cli.c)).
+The example works by defining an RPC in clixon-example.yang:
+```
+    rpc example {
+	description "Some example input/output for testing RFC7950 7.14.
+                     RPC simply echoes the input for debugging.";
+    	input {
+	    leaf x {
+        ...
+```
 
-In the (example_backend.c)[example_backend.c], a callback is registered (fib_route()) which handles the RPC (this is just dummy data):
+In the CLI a netconf rpc call is constructed and sent to the backend: See `example_client_rpc()` in [example_cli.c] CLI plugin.
+
+The clixon backend  plugin [example_backend.c] reveives the netconf call and replies. This is made byregistering a callback handling handling the RPC:
 ```
 static int 
-fib_route(clicon_handle h, 
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
+example_rpc(clicon_handle h, 
+	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
+	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
+	    void         *arg,          /* Client session */
+	    void         *regarg)       /* Argument given at register */
 {
-    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
-	    "<address-family>ipv4</address-family>"
-	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
-	    "<source-protocol>static</source-protocol>"
-	    "</route></rpc-reply>");    
+    /* code that echoes the request */
     return 0;
 }
 int
 clixon_plugin_init(clicon_handle h)
 {
 ...
-   rpc_callback_register(h, fib_route, NULL, "fib-route");
+   rpc_callback_register(h, example_rpc, NULL, "example");
 ...
 }
 ```
@@ -274,7 +306,7 @@ clixon_plugin_api *
 clixon_plugin_init(clicon_handle h)
 {
     /* Optional callback registration for RPC calls */
-    rpc_callback_register(h, fib_route, NULL, "fib-route");
+    rpc_callback_register(h, example_rpc, NULL, "example");
     /* Return plugin API */
     return &api; /* Return NULL on error */
 }
diff --git a/example/example.yang b/example/clixon-example@2019-01-13.yang
similarity index 95%
rename from example/example.yang
rename to example/clixon-example@2019-01-13.yang
index f5e82063..40e53cc6 100644
--- a/example/example.yang
+++ b/example/clixon-example@2019-01-13.yang
@@ -1,22 +1,20 @@
-module example {
+module clixon-example {
     yang-version 1.1;
     namespace "urn:example:clixon";
     prefix ex;
+    revision 2019-01-13 {
+	description
+	    "Released in Clixon 3.9";
+    }
     import ietf-interfaces {
 	prefix if;
     }
     import ietf-ip {
 	prefix ip;
     }
-    import ietf-routing {
-        description "defines fib-route";
-	prefix rt;
-    }
     import iana-if-type {
       prefix ianaift;
     }
-    description
-	"Example code that includes ietf-ip and ietf-routing";
     /* Example interface type for tests, local callbacks, etc */
     identity eth {
 	base if:interface-type;
diff --git a/example/example.xml b/example/example.xml
index b6b42cdb..aaf202b0 100644
--- a/example/example.xml
+++ b/example/example.xml
@@ -1,9 +1,8 @@
 <config>
   <CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
   <CLICON_FEATURE>*:*</CLICON_FEATURE>
-  <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>example</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/example/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/example/netconf</CLICON_NETCONF_DIR>
diff --git a/example/example_backend.c b/example/example_backend.c
index a322ad1e..615d7937 100644
--- a/example/example_backend.c
+++ b/example/example_backend.c
@@ -119,38 +119,6 @@ example_stream_timer_setup(clicon_handle h)
     return event_reg_timeout(t, example_stream_timer, h, "example stream timer");
 }
 
-/*! IETF Routing fib-route rpc 
- * @see ietf-routing@2014-10-26.yang  (fib-route)
- */
-static int 
-fib_route(clicon_handle h,            /* Clicon handle */
-	  cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	  cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	  void         *arg,          /* Client session */
-	  void         *regarg)       /* Argument given at register */
-{
-    cprintf(cbret, "<rpc-reply><route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">"
-	    "<address-family>ipv4</address-family>"
-	    "<next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop>"
-	    "<source-protocol>static</source-protocol>"
-	    "</route></rpc-reply>");    
-    return 0;
-}
-
-/*! IETF Routing route-count rpc 
- * @see ietf-routing@2014-10-26.yang  (route-count)
- */
-static int 
-route_count(clicon_handle h, 
-	    cxobj        *xe,           /* Request: <rpc><xn></rpc> */
-	    cbuf         *cbret,        /* Reply eg <rpc-reply>... */
-	    void         *arg,
-	    void         *regarg)          /* Argument given at register */
-{
-    cprintf(cbret, "<rpc-reply><number-of-routes xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\">42</number-of-routes></rpc-reply>");    
-    return 0;
-}
-
 /*! Smallest possible RPC declaration for test 
  * Yang/XML:
  * If the RPC operation invocation succeeded and no output parameters
@@ -364,18 +332,6 @@ clixon_plugin_init(clicon_handle h)
 
     /* Register callback for routing rpc calls 
      */
-
-    if (rpc_callback_register(h, fib_route, 
-			      NULL, 
-			      "fib-route"/* Xml tag when callback is made */
-			      ) < 0)
-	goto done;
-    /* From ietf-routing.yang */
-    if (rpc_callback_register(h, route_count, 
-			      NULL, 
-			      "route-count"/* Xml tag when callback is made */
-			      ) < 0)
-	goto done;
     /* From example.yang (clicon) */
     if (rpc_callback_register(h, empty_rpc, 
 			      NULL, 
diff --git a/example/example_cli.c b/example/example_cli.c
index ebd2305a..10e122ee 100644
--- a/example/example_cli.c
+++ b/example/example_cli.c
@@ -71,7 +71,6 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
 			      "/interfaces/interface[name='eth0']",
 			      &xret) < 0)
 	goto done;
-
     xml_print(stdout, xret);
     retval = 0;
  done:
@@ -80,25 +79,25 @@ mycallback(clicon_handle h, cvec *cvv, cvec *argv)
     return retval;
 }
 
-/*! Example "downcall": ietf-routing fib-route RPC */
+/*! Example "downcall", ie initiate an RPC to the backend */
 int
-fib_route_rpc(clicon_handle h, 
-	      cvec         *cvv, 
-	      cvec         *argv)
+example_client_rpc(clicon_handle h, 
+		   cvec         *cvv, 
+		   cvec         *argv)
 {
     int        retval = -1;
-    cg_var    *instance;
+    cg_var    *cva;
     cxobj     *xtop = NULL;
     cxobj     *xrpc;
     cxobj     *xret = NULL;
     cxobj     *xerr;
 
     /* User supplied variable in CLI command */
-    instance = cvec_find(cvv, "instance"); /* get a cligen variable from vector */
-    /* Create XML for fib-route netconf RPC */
-    if (xml_parse_va(&xtop, NULL, "<rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><fib-route xmlns=\"urn:ietf:params:xml:ns:yang:ietf-routing\"><routing-instance-name>%s</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>",
+    cva = cvec_find(cvv, "a"); /* get a cligen variable from vector */
+    /* Create XML for example netconf RPC */
+    if (xml_parse_va(&xtop, NULL, "<rpc message-id=\"101\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" username=\"%s\"><example xmlns=\"urn:example:clixon\"><x>%s</x></example></rpc>",
 		     clicon_username_get(h),
-		     cv_string_get(instance)) < 0)
+		     cv_string_get(cva)) < 0)
 	goto done;
     /* Skip top-level */
     xrpc = xml_child_i(xtop, 0);
@@ -110,7 +109,12 @@ fib_route_rpc(clicon_handle h,
 	goto done;
     }
     /* Print result */
-    xml2txt(stdout, xml_child_i(xret, 0), 0);
+    clicon_xml2file(stdout, xml_child_i(xret, 0), 0, 0);
+    fprintf(stdout,"\n");
+
+    /* pretty-print:
+       xml2txt(stdout, xml_child_i(xret, 0), 0);
+    */
     retval = 0;
  done:
     if (xret)
diff --git a/example/example_cli.cli b/example/example_cli.cli
index 892c687a..52c2bcf7 100644
--- a/example/example_cli.cli
+++ b/example/example_cli.cli
@@ -63,7 +63,7 @@ load("Load configuration from XML file") <filename:string>("Filename (local file
     merge("Merge file with existent candidate"), load_config_file("filename", "merge");
 }
 example("This is a comment") <var:int32>("Just a random number"), mycallback("myarg");
-rpc("ex:fib-route rpc") <instance:string>("routing instance"), fib_route_rpc("myarg");
+rpc("example rpc") <a:string>("routing instance"), example_client_rpc("");
 notify("Get notifications from backend"), cli_notify("EXAMPLE", "1", "text");
 no("Negate") notify("Get notifications from backend"), cli_notify("EXAMPLE", "0", "xml");
 lock,cli_lock("candidate");
diff --git a/example/ietf-interfaces@2014-05-08.yang b/example/ietf-interfaces@2014-05-08.yang
deleted file mode 100644
index 217bd979..00000000
--- a/example/ietf-interfaces@2014-05-08.yang
+++ /dev/null
@@ -1,698 +0,0 @@
-   module ietf-interfaces {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
-     prefix if;
-
-     import ietf-yang-types {
-       prefix yang;
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Martin Bjorklund
-                  <mailto:mbj@tail-f.com>";
-
-     description
-       "This module contains a collection of YANG definitions for
-        managing network interfaces.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code.  All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject
-        to the license terms contained in, the Simplified BSD License
-        set forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC 7223; see
-        the RFC itself for full legal notices.";
-
-     revision 2014-05-08 {
-       description
-         "Initial revision.";
-       reference
-         "RFC 7223: A YANG Data Model for Interface Management";
-     }
-
-     /*
-      * Typedefs
-      */
-
-     typedef interface-ref {
-       type leafref {
-         path "/if:interfaces/if:interface/if:name";
-       }
-       description
-         "This type is used by data models that need to reference
-          configured interfaces.";
-     }
-
-     typedef interface-state-ref {
-       type leafref {
-         path "/if:interfaces-state/if:interface/if:name";
-       }
-       description
-         "This type is used by data models that need to reference
-          the operationally present interfaces.";
-     }
-
-     /*
-      * Identities
-      */
-
-     identity interface-type {
-       description
-         "Base identity from which specific interface types are
-          derived.";
-     }
-
-     /*
-      * Features
-      */
-
-     feature arbitrary-names {
-       description
-         "This feature indicates that the device allows user-controlled
-          interfaces to be named arbitrarily.";
-     }
-
-     feature pre-provisioning {
-       description
-         "This feature indicates that the device supports
-          pre-provisioning of interface configuration, i.e., it is
-          possible to configure an interface whose physical interface
-          hardware is not present on the device.";
-     }
-
-     feature if-mib {
-       description
-         "This feature indicates that the device implements
-          the IF-MIB.";
-       reference
-         "RFC 2863: The Interfaces Group MIB";
-     }
-
-     /*
-      * Configuration data nodes
-      */
-
-     container interfaces {
-       description
-         "Interface configuration parameters.";
-
-       list interface {
-         key "name";
-
-         description
-           "The list of configured interfaces on the device.
-
-            The operational state of an interface is available in the
-            /interfaces-state/interface list.  If the configuration of a
-            system-controlled interface cannot be used by the system
-            (e.g., the interface hardware present does not match the
-            interface type), then the configuration is not applied to
-            the system-controlled interface shown in the
-            /interfaces-state/interface list.  If the configuration
-            of a user-controlled interface cannot be used by the system,
-            the configured interface is not instantiated in the
-            /interfaces-state/interface list.";
-
-        leaf name {
-           type string;
-           description
-             "The name of the interface.
-
-              A device MAY restrict the allowed values for this leaf,
-              possibly depending on the type of the interface.
-
-              For system-controlled interfaces, this leaf is the
-              device-specific name of the interface.  The 'config false'
-              list /interfaces-state/interface contains the currently
-              existing interfaces on the device.
-
-              If a client tries to create configuration for a
-              system-controlled interface that is not present in the
-              /interfaces-state/interface list, the server MAY reject
-              the request if the implementation does not support
-              pre-provisioning of interfaces or if the name refers to
-              an interface that can never exist in the system.  A
-              NETCONF server MUST reply with an rpc-error with the
-              error-tag 'invalid-value' in this case.
-
-              If the device supports pre-provisioning of interface
-              configuration, the 'pre-provisioning' feature is
-              advertised.
-
-              If the device allows arbitrarily named user-controlled
-              interfaces, the 'arbitrary-names' feature is advertised.
-
-              When a configured user-controlled interface is created by
-              the system, it is instantiated with the same name in the
-              /interface-state/interface list.";
-         }
-
-         leaf description {
-           type string;
-           description
-             "A textual description of the interface.
-
-              A server implementation MAY map this leaf to the ifAlias
-              MIB object.  Such an implementation needs to use some
-              mechanism to handle the differences in size and characters
-              allowed between this leaf and ifAlias.  The definition of
-              such a mechanism is outside the scope of this document.
-
-              Since ifAlias is defined to be stored in non-volatile
-              storage, the MIB implementation MUST map ifAlias to the
-              value of 'description' in the persistently stored
-              datastore.
-
-              Specifically, if the device supports ':startup', when
-              ifAlias is read the device MUST return the value of
-              'description' in the 'startup' datastore, and when it is
-              written, it MUST be written to the 'running' and 'startup'
-              datastores.  Note that it is up to the implementation to
-
-              decide whether to modify this single leaf in 'startup' or
-              perform an implicit copy-config from 'running' to
-              'startup'.
-
-              If the device does not support ':startup', ifAlias MUST
-              be mapped to the 'description' leaf in the 'running'
-              datastore.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAlias";
-         }
-
-         leaf type {
-           type identityref {
-             base interface-type;
-           }
-           mandatory true;
-           description
-             "The type of the interface.
-
-              When an interface entry is created, a server MAY
-              initialize the type leaf with a valid value, e.g., if it
-              is possible to derive the type from the name of the
-              interface.
-
-              If a client tries to set the type of an interface to a
-              value that can never be used by the system, e.g., if the
-              type is not supported or if the type does not match the
-              name of the interface, the server MUST reject the request.
-              A NETCONF server MUST reply with an rpc-error with the
-              error-tag 'invalid-value' in this case.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifType";
-         }
-
-         leaf enabled {
-           type boolean;
-           default "true";
-           description
-             "This leaf contains the configured, desired state of the
-              interface.
-
-              Systems that implement the IF-MIB use the value of this
-              leaf in the 'running' datastore to set
-              IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
-              has been initialized, as described in RFC 2863.
-
-              Changes in this leaf in the 'running' datastore are
-              reflected in ifAdminStatus, but if ifAdminStatus is
-              changed over SNMP, this leaf is not affected.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-         }
-
-         leaf link-up-down-trap-enable {
-           if-feature if-mib;
-           type enumeration {
-             enum enabled {
-               value 1;
-             }
-             enum disabled {
-               value 2;
-             }
-           }
-           description
-             "Controls whether linkUp/linkDown SNMP notifications
-              should be generated for this interface.
-
-              If this node is not configured, the value 'enabled' is
-              operationally used by the server for interfaces that do
-              not operate on top of any other interface (i.e., there are
-              no 'lower-layer-if' entries), and 'disabled' otherwise.";
-           reference
-             "RFC 2863: The Interfaces Group MIB -
-                        ifLinkUpDownTrapEnable";
-         }
-       }
-     }
-
-     /*
-      * Operational state data nodes
-      */
-
-     container interfaces-state {
-       config false;
-       description
-         "Data nodes for the operational state of interfaces.";
-
-       list interface {
-         key "name";
-
-         description
-           "The list of interfaces on the device.
-
-            System-controlled interfaces created by the system are
-            always present in this list, whether they are configured or
-            not.";
-
-         leaf name {
-           type string;
-           description
-             "The name of the interface.
-
-              A server implementation MAY map this leaf to the ifName
-              MIB object.  Such an implementation needs to use some
-              mechanism to handle the differences in size and characters
-              allowed between this leaf and ifName.  The definition of
-              such a mechanism is outside the scope of this document.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifName";
-         }
-
-         leaf type {
-           type identityref {
-             base interface-type;
-           }
-           mandatory true;
-           description
-             "The type of the interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifType";
-         }
-
-         leaf admin-status {
-           if-feature if-mib;
-           type enumeration {
-             enum up {
-               value 1;
-               description
-                 "Ready to pass packets.";
-             }
-             enum down {
-               value 2;
-               description
-                 "Not ready to pass packets and not in some test mode.";
-             }
-
-             enum testing {
-               value 3;
-               description
-                 "In some test mode.";
-             }
-           }
-           mandatory true;
-           description
-             "The desired state of the interface.
-
-              This leaf has the same read semantics as ifAdminStatus.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
-         }
-
-         leaf oper-status {
-           type enumeration {
-             enum up {
-               value 1;
-               description
-                 "Ready to pass packets.";
-             }
-             enum down {
-               value 2;
-               description
-                 "The interface does not pass any packets.";
-             }
-             enum testing {
-               value 3;
-               description
-                 "In some test mode.  No operational packets can
-                  be passed.";
-             }
-             enum unknown {
-               value 4;
-               description
-                 "Status cannot be determined for some reason.";
-             }
-             enum dormant {
-               value 5;
-               description
-                 "Waiting for some external event.";
-             }
-             enum not-present {
-               value 6;
-               description
-                 "Some component (typically hardware) is missing.";
-             }
-
-             enum lower-layer-down {
-               value 7;
-               description
-                 "Down due to state of lower-layer interface(s).";
-             }
-           }
-           mandatory true;
-           description
-             "The current operational state of the interface.
-
-              This leaf has the same semantics as ifOperStatus.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifOperStatus";
-         }
-
-         leaf last-change {
-           type yang:date-and-time;
-           description
-             "The time the interface entered its current operational
-              state.  If the current state was entered prior to the
-              last re-initialization of the local network management
-              subsystem, then this node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifLastChange";
-         }
-
-         leaf if-index {
-           if-feature if-mib;
-           type int32 {
-             range "1..2147483647";
-           }
-           mandatory true;
-           description
-             "The ifIndex value for the ifEntry represented by this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifIndex";
-         }
-
-         leaf phys-address {
-           type yang:phys-address;
-           description
-             "The interface's address at its protocol sub-layer.  For
-              example, for an 802.x interface, this object normally
-              contains a Media Access Control (MAC) address.  The
-              interface's media-specific modules must define the bit
-              and byte ordering and the format of the value of this
-              object.  For interfaces that do not have such an address
-              (e.g., a serial line), this node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
-         }
-
-         leaf-list higher-layer-if {
-           type interface-state-ref;
-           description
-             "A list of references to interfaces layered on top of this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifStackTable";
-         }
-
-         leaf-list lower-layer-if {
-           type interface-state-ref;
-           description
-             "A list of references to interfaces layered underneath this
-              interface.";
-           reference
-             "RFC 2863: The Interfaces Group MIB - ifStackTable";
-         }
-
-         leaf speed {
-           type yang:gauge64;
-           units "bits/second";
-           description
-               "An estimate of the interface's current bandwidth in bits
-                per second.  For interfaces that do not vary in
-                bandwidth or for those where no accurate estimation can
-                be made, this node should contain the nominal bandwidth.
-                For interfaces that have no concept of bandwidth, this
-                node is not present.";
-           reference
-             "RFC 2863: The Interfaces Group MIB -
-                        ifSpeed, ifHighSpeed";
-         }
-
-         container statistics {
-           description
-             "A collection of interface-related statistics objects.";
-
-           leaf discontinuity-time {
-             type yang:date-and-time;
-             mandatory true;
-             description
-               "The time on the most recent occasion at which any one or
-                more of this interface's counters suffered a
-                discontinuity.  If no such discontinuities have occurred
-                since the last re-initialization of the local management
-                subsystem, then this node contains the time the local
-                management subsystem re-initialized itself.";
-           }
-
-           leaf in-octets {
-             type yang:counter64;
-             description
-               "The total number of octets received on the interface,
-                including framing characters.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
-           }
-
-           leaf in-unicast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were not addressed to a
-                multicast or broadcast address at this sub-layer.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
-           }
-
-           leaf in-broadcast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were addressed to a broadcast
-                address at this sub-layer.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCInBroadcastPkts";
-           }
-
-           leaf in-multicast-pkts {
-             type yang:counter64;
-             description
-               "The number of packets, delivered by this sub-layer to a
-                higher (sub-)layer, that were addressed to a multicast
-                address at this sub-layer.  For a MAC-layer protocol,
-                this includes both Group and Functional addresses.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCInMulticastPkts";
-           }
-
-           leaf in-discards {
-             type yang:counter32;
-             description
-               "The number of inbound packets that were chosen to be
-                discarded even though no errors had been detected to
-                prevent their being deliverable to a higher-layer
-                protocol.  One possible reason for discarding such a
-                packet could be to free up buffer space.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInDiscards";
-           }
-
-           leaf in-errors {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of inbound
-                packets that contained errors preventing them from being
-                deliverable to a higher-layer protocol.  For character-
-                oriented or fixed-length interfaces, the number of
-                inbound transmission units that contained errors
-                preventing them from being deliverable to a higher-layer
-                protocol.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInErrors";
-           }
-
-           leaf in-unknown-protos {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of packets
-                received via the interface that were discarded because
-                of an unknown or unsupported protocol.  For
-                character-oriented or fixed-length interfaces that
-                support protocol multiplexing, the number of
-                transmission units received via the interface that were
-                discarded because of an unknown or unsupported protocol.
-                For any interface that does not support protocol
-                multiplexing, this counter is not present.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
-           }
-           leaf out-octets {
-             type yang:counter64;
-             description
-               "The total number of octets transmitted out of the
-                interface, including framing characters.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
-           }
-
-           leaf out-unicast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were not addressed
-                to a multicast or broadcast address at this sub-layer,
-                including those that were discarded or not sent.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
-           }
-
-           leaf out-broadcast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were addressed to a
-                broadcast address at this sub-layer, including those
-                that were discarded or not sent.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCOutBroadcastPkts";
-           }
-
-           leaf out-multicast-pkts {
-             type yang:counter64;
-             description
-               "The total number of packets that higher-level protocols
-                requested be transmitted, and that were addressed to a
-                multicast address at this sub-layer, including those
-                that were discarded or not sent.  For a MAC-layer
-                protocol, this includes both Group and Functional
-                addresses.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB -
-                          ifHCOutMulticastPkts";
-           }
-
-           leaf out-discards {
-             type yang:counter32;
-             description
-               "The number of outbound packets that were chosen to be
-                discarded even though no errors had been detected to
-                prevent their being transmitted.  One possible reason
-                for discarding such a packet could be to free up buffer
-                space.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
-           }
-
-           leaf out-errors {
-             type yang:counter32;
-             description
-               "For packet-oriented interfaces, the number of outbound
-                packets that could not be transmitted because of errors.
-                For character-oriented or fixed-length interfaces, the
-                number of outbound transmission units that could not be
-                transmitted because of errors.
-
-                Discontinuities in the value of this counter can occur
-                at re-initialization of the management system, and at
-                other times as indicated by the value of
-                'discontinuity-time'.";
-             reference
-               "RFC 2863: The Interfaces Group MIB - ifOutErrors";
-           }
-         }
-       }
-     }
-   }
-
diff --git a/example/ietf-ipsec@2016-03-09.yang b/example/ietf-ipsec@2016-03-09.yang
deleted file mode 100644
index b8beed47..00000000
--- a/example/ietf-ipsec@2016-03-09.yang
+++ /dev/null
@@ -1,3672 +0,0 @@
-   module ietf-ipsec {
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipsec";
-     prefix "eipsec";
-
-     import ietf-inet-types {
-       prefix inet;
-     }
-
-     import ietf-yang-types {
-       prefix yang;
-     }
-
-     organization "Ericsson AB.
-                   Huawei Technologies India Pvt Ltd.";
-
-     contact "Web:   <http://www.ericsson.com>";
-
-     description
-       "This YANG module defines the configuration and operational
-        state data for Internet Protocol Security (IPSec) on
-        IETF draft.
-        Copyright (c) 2016 Ericsson AB.
-        All rights reserved.";
-
-     revision 2016-03-09 {
-       description
-         "Third revision.
-          Fix YANG compiling error because it used internal
-          data model econtext and should be removed in the
-          draft.
-          Fix warnings.
-          Run validation on
-          http://www.netconfcentral.org/yangdumpresults";
-       reference
-         "Update since second revision.";
-     }
-     revision 2015-09-13 {
-       description
-         "Second revision.";
-       reference
-         "updates since initial revision.
-         combining:
-          draft-tran-ipecme-yang-ipsec-00.
-          draft-wang-ipsecme-ike-yang-00.
-          draft-wang-ipsecme-ipsec-yang-00.";
-     }
-     revision 2015-05-14 {
-       description
-         "Initial revision.";
-       reference
-         "May 14, 2015  draft-tran-ipecme-yang-ipsec-00.
-          May 22, 2015  draft-wang-ipsecme-ike-yang-00.
-          June 15, 2015 draft-wang-ipsecme-ipsec-yang-00.";
-     }
-     /*--------------------*/
-     /* Feature            */
-     /*--------------------*/
-
-     feature ikev1 {
-       description
-         "Feature IKEv1";
-     }
-
-     feature ike-proposal-state {
-       description
-         "IKEv2 Proposal Operational State";
-     }
-
-     feature ike-policy-state {
-       description
-         "IKEv1 Policy Operational State";
-     }
-
-     feature ikev1-state {
-       description
-         "IKEv1 Operational State";
-     }
-
-     feature ike-reauth-failure {
-       description
-         "IKEv1 Reauthorization Failure";
-     }
-
-     feature ike-rekey-failure {
-       description
-         "IKEv1 Rekey Failure";
-     }
-
-
-     feature ikev2 {
-       description
-         "Feature IKEv2";
-
-     }
-
-     feature ikev2-global {
-       description
-         "Feature IKEv2 Global Parameters";
-
-     }
-
-     feature ikev2-peer {
-       description
-         "Feature IKEv2 Peer";
-
-     }
-
-     feature ikev2-proposal {
-       description
-         "Feature IKEv2 Proposal";
-
-     }
-
-     feature ikev2-policy {
-       description
-         "Feature IKEv2 Policy";
-
-     }
-
-     feature ikev2-proposal-state {
-       description
-         "IKEv2 Proposal Operational State";
-     }
-
-     feature ikev2-state {
-       description
-         "IKEv2 Operational State";
-     }
-
-     feature ipsec {
-       description
-         "Feature IPsec";
-
-     }
-
-     feature ipsec-acl {
-       description
-         "Feature IPsec ACL";
-     }
-     feature ipsec-sad {
-       description
-         "Feature IPsec SAD";
-
-     }
-
-     feature ipsec-proposal {
-       description
-         "Feature IPsec Proposal";
-
-     }
-
-     feature ipsec-spd {
-       description
-         "Feature IPsec SPD";
-
-     }
-
-     feature ipsec-policy-state {
-       description
-         "IPsec Policy Operational State";
-     }
-
-     feature ipsec-proposal-state {
-       description
-         "IPsec Proposal Operational State";
-     }
-
-     feature ipsec-alarms-state {
-       description
-         "IPsec Alarm State Operational State";
-     }
-
-     feature ipsec-sa-ah-state {
-       description
-         "IPsec SA AH Operational State";
-     }
-
-     feature ipsec-sa-state {
-       description
-         "IPsec SA Operational State";
-     }
-
-     feature ipsec-tunnel {
-       description
-         "IPsec Tunnel";
-     }
-
-     feature ipsec-local-address-range {
-       description
-         "IPsec Local Address Range";
-     }
-
-     feature ipsec-remote-address-range {
-       description
-         "IPsec Remote Address Range";
-     }
-
-     feature ipsec-next-protocol-range {
-       description
-         "IPsec Next Protocol Range";
-     }
-
-     feature ipsec-local-port-range {
-       description
-         "IPsec Local Port Range";
-     }
-
-     feature ipsec-remote-port-range {
-       description
-         "IPsec Remote Port Range";
-     }
-
-     feature ipsec-ah-authentication {
-       description
-         "IPsec AH Authentication";
-     }
-
-     feature ipsec-esp-integrity {
-       description
-         "IPsec ESP Integrity";
-     }
-
-     feature ipsec-esp-encrypt {
-       description
-         "IPsec ESP encryption";
-     }
-
-     feature ipsec-stat {
-       description
-         "IPsec Stats";
-     }
-
-     feature ipsec-state {
-       description
-         "IPsec Operational State";
-     }
-
-     feature ipsec-rekey-failure {
-       description
-         "IPsec Rekey Failure";
-     }
-
-     feature ipsec-redundancy {
-       description
-         "IPsec Redundancy State";
-     }
-
-     feature sad {
-       description
-         "Security Association (SA) Database";
-     }
-
-     feature spd {
-       description
-         "Security Policy Database";
-     }
-
-     feature ipsec-global-stats {
-       description
-         "IPsec Global Stats";
-     }
-
-     feature clear-ipsec-group {
-       description
-         "Clear IPsec group";
-     }
-
-     feature clear-ike-group {
-       description
-         "Clear IKE group";
-     }
-
-     feature clear-ikev2-group {
-       description
-         "Clear IKEv2 group";
-     }
-
-     feature reset-ipv4 {
-       description
-         "Reset IPv4";
-     }
-
-     feature reset-ipv6 {
-       description
-         "Reset IPv6";
-     }
-
-     feature reset-global {
-       description
-         "Reset Global";
-     }
-
-     feature peer-authentication-failure {
-       description
-         "Peer Authentication Failure";
-     }
-     /*--------------------*/
-     /* Typedefs           */
-     /*--------------------*/
-
-     typedef authentication-method-t {
-       type enumeration {
-         enum psk {
-           value 0;
-           description
-             "Pre-Sharing Keys.";
-         }
-         enum certificate {
-           value 1;
-           description
-             "Certificate.";
-         }
-       }
-       description
-         "Available authentication methods.";
-     }
-
-     /* IKEv2 Exchange Types (ET) */
-     typedef ikev2-exchange-type-t {
-       type enumeration {
-         enum ikev2-et-ike-sa-init {
-           value 34;
-           description
-             "ikev2-et-ike-sa-init - RFC 7296.";
-         }
-         enum ikev2-et-ike-auth {
-           value 35;
-           description
-             "ikev2-et-ike-auth - RFC 7296.";
-         }
-         enum ikev2-et-create-child-sa {
-           value 36;
-           description
-             "ikev2-et-create-child-sa - RFC 7296.";
-         }
-         enum ikev2-et-informational {
-           value 37;
-           description
-             "ikev2-et-informational - RFC 7296.";
-         }
-         enum ikev2-et-ike-session-resume {
-           value 38;
-           description
-             "ikev2-et-ike-session-resume - RFC 7296.";
-         }
-         enum ikev2-et-gsa-auth {
-           value 39;
-           description
-             "ikev2-et-gsa-auth - RFC 7296.";
-         }
-         enum ikev2-et-gsa-registration {
-           value 40;
-           description
-             "ikev2-et-gsa-registration - RFC 7296.";
-         }
-         enum ikev2-et-gsa-rekey {
-           value 41;
-           description
-             "ikev2-et-gsa-rekey - RFC 7296.";
-         }
-       }
-       description
-         "IKEv2 Exchange Types (ET).";
-     }
-
-      /* Transform Type Values (TTV), RFC 7296 */
-      typedef transform-type-value-t {
-       type enumeration {
-         enum ttv-reserved-0 {
-           value 0;
-           description
-             "ttv-reserved-0 - Transform Type Value Reserved "+
-             "(RFC 7296).";
-         }
-         enum ttv-encr {
-           value 1;
-           description
-             "ttv-encr - Transform Type Value 1,
-              Encryption Algorithm "+
-             "(ENCR) used in IKE and ESP.";
-         }
-         enum ttv-prf {
-           value 2;
-           description
-             "ttv-prf - Transform Type Value 2, "+
-             "Pseudo-Random Function(PRF) used in IKE.";
-         }
-         enum ttv-integ {
-           value 3;
-           description
-             "ttv-integ - Transform Type Value 3, Integrity Algorithm"+
-             " (INTEG) used in IKE, AH, optional ESP.";
-         }
-         enum ttv-dh {
-           value 4;
-           description
-             "ttv-dh - Transform Type Value 4, Diffie-Hellman (DH) "+
-             "used in IKE, optional AH and ESP.";
-         }
-         enum ttv-esn {
-           value 5;
-           description
-             "ttv-esn - Transform Type Value 5, Extended Sequence "+
-             "Numbers (ESN) used in AH and ESP.";
-         }
-       }
-       description
-         "Transform Type Values (RFC 7296).";
-     }
-
-      /* IKEv2 Transform Attribute Types (TAT) */
-      typedef ikev2-transform-attribute-type-t {
-       type enumeration {
-         enum ikev2-tat-reserved-0 {
-           value 0;
-           description
-             "ikev2-tat-reserved-0 - IKEv2 Transform Attribute "+
-             "Type Reserved-0 (RFC 7296).";
-         }
-         enum ikev2-tat-reserved-1 {
-           value 1;
-           description
-             "ikev2-tat-reserved-1 - IKEv2 Transform Attribute "+
-             "Type Reserved-1 (RFC 7296).";
-         }
-         enum ikev2-tat-reserved-13 {
-           value 13;
-           description
-             "ikev2-tat-reserved-13 - IKEv2 Transform Attribute "+
-             "Type Reserved-13 (RFC 7296).";
-         }
-         enum ikev2-tat-key-length {
-           value 41;
-           description
-             "ikev2-tat-key-length - IKEv2 Transform Attribute "+
-             "Type KEY LENGTH (in bits) (RFC 7296).";
-         }
-       }
-       description
-         "IKEv2 Transform Attribute Types (TAT) (RFC 7296).";
-     }
-
-      /* Transform Type 1 (Encryption Algorithm Transform IDs) */
-     typedef ike-encryption-algorithm-t {
-       type enumeration {
-         enum encr-reserved-0 {
-           value 0;
-           description
-             "encr-reserved-0 --> RFC_5996.";
-         }
-         enum encr-des-iv4 {
-           value 1;
-           description
-             "encr-des-iv4 --> RFC_5996.";
-         }
-         enum encr-des {
-           value 2;
-           description
-             "encr-des --> RFC_5996.";
-         }
-         enum encr-3des {
-           value 3;
-           description
-             "encr-3des --> RFC_5996.";
-         }
-         enum encr-rc5 {
-           value 4;
-           description
-             "encr-rc5 --> RFC_5996.";
-         }
-         enum encr-idea {
-           value 5;
-           description
-             "encr-idea --> RFC_5996.";
-         }
-         enum encr-cast {
-           value 6;
-           description
-             "encr-cast --> RFC_5996.";
-         }
-         enum encr-blowfish {
-           value 7;
-           description
-             "encr-blowfish --> RFC_5996.";
-         }
-         enum encr-3idea {
-           value 8;
-           description
-             "encr-3idea --> RFC_5996.";
-         }
-         enum encr-des-iv32 {
-           value 9;
-           description
-             "encr-des-iv32 --> RFC_5996.";
-         }
-         enum encr-reserved-10 {
-           value 10;
-           description
-             "encr-reserved-10 --> RFC_5996.";
-         }
-         enum encr-null {
-           value 11;
-           description
-             "encr-null --> RFC_5996.";
-         }
-         enum encr-aes-cbc {
-           value 12;
-           description
-             "encr-aes-cbc --> RFC_5996.";
-         }
-         enum encr-aes-ctr {
-           value 13;
-           description
-             "encr-aes-ctr --> RFC_5996.";
-         }
-         enum encr-aes-ccm-8 {
-           value 14;
-           description
-             "encr-aes-ccm-8 --> RFC_5996.";
-         }
-         enum encr-aes-ccm-12 {
-           value 15;
-           description
-             "encr-aes-ccm-12 --> RFC_5996.";
-         }
-         enum encr-aes-ccm-16 {
-           value 16;
-           description
-             "encr-aes-ccm-16 --> RFC_5996.";
-         }
-         enum encr-reserved-17 {
-           value 17;
-           description
-             "encr-reserved-17 --> RFC_5996.";
-         }
-         enum encr-aes-gcm-8-icv {
-           value 18;
-           description
-             "encr-aes-gcm-8-icv --> RFC_5996.";
-         }
-         enum encr-aes-gcm-12-icv {
-           value 19;
-           description
-             "encr-aes-gcm-12-icv --> RFC_5996.";
-         }
-         enum encr-aes-gcm-16-icv {
-           value 20;
-           description
-             "encr-aes-gcm-16-icv--> RFC_5996.";
-         }
-         enum encr-null-auth-aes-gmac {
-           value 21;
-           description
-             "encr-null-auth-aes-gmac --> RFC_5996.";
-         }
-         enum encr-ieee-p1619-xts-aes {
-           value 22;
-           description
-             "encr-ieee-p1619-xts-aes --> Reserved for "+
-             "IEEE P1619 XTS-AES.";
-         }
-         enum encr-camellia-cbc {
-           value 23;
-           description
-             "encr-camellia-cbc --> RFC_5996.";
-         }
-         enum encr-camellia-ctr {
-           value 24;
-           description
-             "encr-camellia-ctr --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-8-icv {
-           value 25;
-           description
-             "encr-camellia-ccm-8-icv --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-12-icv {
-           value 26;
-           description
-             "encr-camellia-ccm-12-icv --> RFC_5996.";
-         }
-         enum encr-camellia-ccm-16-icv {
-           value 27;
-           description
-             "encr-camellia-ccm-16-icv --> RFC_5996.";
-         }
-         enum encr-aes-cbc-128 {
-           value 1024;
-           description
-             "encr-aes-cbc-128 --> RFC_5996.";
-         }
-         enum encr-aes-cbc-192 {
-           value 1025;
-           description
-             "encr-aes-cbc-192 --> RFC_5996.";
-         }
-         enum encr-aes-cbc-256 {
-           value 1026;
-           description
-             "encr-aes-cbc-256 --> RFC_5996.";
-         }
-         enum encr-blowfish-128 {
-           value 1027;
-           description
-             "encr-blowfish-128 --> RFC_5996.";
-         }
-         enum encr-blowfish-192 {
-           value 1028;
-           description
-             "encr-blowfish-192 --> RFC_5996.";
-         }
-         enum encr-blowfish-256 {
-           value 1029;
-           description
-             "encr-blowfish-256 --> RFC_5996.";
-         }
-         enum encr-blowfish-448 {
-           value 1030;
-           description
-             "encr-blowfish-448 --> RFC_5996.";
-         }
-         enum encr-camellia-128 {
-           value 1031;
-           description
-             "encr-camellia-128 --> RFC_5996.";
-         }
-         enum encr-camellia-192 {
-           value 1032;
-           description
-             "encr-camellia-192 --> RFC_5996.";
-         }
-         enum encr-camellia-256 {
-           value 1033;
-           description
-             "encr-camellia-256 --> RFC_5996.";
-         }
-       }
-       description
-         "Transform Type 1 - Internet Key Exchange (IKE) "+
-         "encryption algorithms.";
-     }
-
-     /* Transform Type 2 (Pseudo-Random Function PRF) */
-     typedef pseudo-random-function-t {
-       type enumeration {
-         enum prf-reserved-0 {
-           value 0;
-           description
-             "prf-reserved-0 --> RFC_2104.";
-         }
-         enum prf-hmac-md5 {
-           value 1;
-           description
-             "prf-hmac-md5 --> RFC_2104.";
-         }
-         enum prf-hmac-sha1 {
-           value 2;
-           description
-             "prf-hmac-sha1 --> RFC2104.";
-         }
-         enum prf-hmac-tiger {
-           value 3;
-           description
-             "prf-hmac-tiger --> RFC2104.";
-         }
-         enum prf-aes128-xcbc {
-           value 4;
-           description
-             "prf-aes128-xcbc --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-256 {
-           value 5;
-           description
-             "prf-hmac-sha2-256 --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-384 {
-           value 6;
-           description
-             "prf-hmac-sha2-384 --> RFC_4434.";
-         }
-         enum prf-hmac-sha2-512 {
-           value 7;
-           description
-             "prf-hmac-sha2-512 --> RFC_4434.";
-         }
-         enum prf-aes128-cmac {
-           value 8;
-           description
-             "prf-aes128-cmac --> RFC_4615.";
-         }
-       }
-       description
-         "Available Pseudo-Random Functions (PRF).";
-     }
-
-      /* Transform Type 3 (Integrity Algorithm) */
-     typedef ike-integrity-algorithm-t {
-       type enumeration {
-         enum auth-none {
-           value 0;
-           description
-             "auth-none --> RFC_5996.";
-         }
-         enum auth-hmac-md5-96 {
-           value 1;
-           description
-             "auth-hmac-md5-96 --> RFC_5996.";
-         }
-         enum auth-hmac-sha1-96 {
-           value 2;
-           description
-             "auth-hmac-sha1-96 --> RFC_5996.";
-         }
-         enum auth-des-mac {
-           value 3;
-           description
-             "auth-des-mac --> RFC_5996.";
-         }
-         enum auth-kpdk-md5 {
-           value 4;
-           description
-             "auth-kpdk-md5 --> RFC_5996.";
-         }
-         enum auth-aes-xcbc-96 {
-           value 5;
-           description
-             "auth-aes-xcbc-96 --> RFC_5996.";
-         }
-         enum auth-hmac-md5-128 {
-           value 6;
-           description
-             "auth-hmac-md5-128 --> RFC_5996.";
-         }
-         enum auth-hmac-sha1-160 {
-           value 7;
-           description
-             "auth-hmac-sha1-160 --> RFC_5996.";
-         }
-         enum auth-aes-cmac-96 {
-           value 8;
-           description
-             "auth-aes-cmac-96 --> RFC_5996.";
-         }
-         enum auth-aes-128-gmac {
-           value 9;
-           description
-             "auth-aes-128-gmac --> RFC_5996.";
-         }
-         enum auth-aes-192-gmac {
-           value 10;
-           description
-             "auth-aes-192-gmac --> RFC_5996.";
-         }
-         enum auth-aes-256-gmac {
-           value 11;
-           description
-             "auth-aes-256-gmac --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-256-128 {
-           value 12;
-           description
-             "auth-hmac-sha2-256-128 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-384-192 {
-           value 13;
-           description
-             "auth-hmac-sha2-384-192 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-512-256 {
-           value 14;
-           description
-             "auth-hmac-sha2-512-256 --> RFC_5996.";
-         }
-         enum auth-hmac-sha2-256-96 {
-           value 1024;
-           description
-             "auth-hmac-sha2-256-96.";
-         }
-       }
-       description
-         "Transform Type 3 - Internet Key Exchange (IKE) "+
-         "Integrity Algorithms.";
-     }
-
-     /* Transform Type 4 (Diffie-Hellman Group) */
-     typedef diffie-hellman-group-t {
-       type enumeration {
-         enum group-none {
-           value 0;
-           description
-             "group-none --> RFC_5996.";
-         }
-         enum modp-768-group-1 {
-           value 1;
-           description
-             "modp-768-group-1 --> RFC_5996.";
-         }
-         enum modp-1024-group-2 {
-           value 2;
-           description
-             "modp-1024-group-2 --> RFC_5996.";
-         }
-         enum modp-1536-group-5 {
-           value 5;
-           description
-             "modp-1536-group-5 --> RFC_3526.";
-         }
-         enum modp-2048-group-14 {
-           value 14;
-           description
-             "modp-2048-group-14 --> RFC_3526.";
-         }
-         enum modp-3072-group-15 {
-           value 15;
-           description
-             "modp-3072-group-15 --> RFC_3526.";
-         }
-         enum modp-4096-group-16 {
-           value 16;
-           description
-             "modp-4096-group-16 --> RFC_3526.";
-         }
-         enum modp-6144-group-17 {
-           value 17;
-           description
-             "modp-6144-group-17 --> RFC_3526.";
-         }
-         enum modp-8192-group-18 {
-           value 18;
-           description
-             "modp-8192-group-18 --> RFC_3526.";
-         }
-         enum recp-256-group-19 {
-           value 19;
-           description
-             "recp-256-group-19 --> RFC_6989. 256-bit"+
-             " Random ECP Group.";
-         }
-         enum recp-384-group-20 {
-           value 20;
-           description
-             "recp-384-group-20 --> RFC_6989. 384-bit"+
-             " Random ECP Group.";
-         }
-         enum recp-521-group-21 {
-           value 21;
-           description
-             "recp-521-group-21 --> RFC_6989. 521-bit"+
-             " Random ECP Group.";
-         }
-         enum modp-1024-160-pos-group-22 {
-           value 22;
-           description
-             "modp-1024-160-pos-group-22 --> RFC_6989."+
-             " 1024-bit MODP Group with"+
-             " 160-bit Prime Order Subgroup (POS).";
-         }
-         enum modp-2048-224-pos-group-23 {
-           value 23;
-           description
-             "modp-2048-224-pos-group-23 --> RFC_6989."+
-             " 2048-bit MODP Group with"+
-             " 224-bit Prime Order Subgroup (POS).";
-         }
-         enum modp-2048-256-pos-group-24 {
-           value 24;
-           description
-             "modp-2048-256-pos-group-24 --> RFC_6989."+
-             " 2048-bit MODP Group with"+
-             " 256-bit Prime Order Subgroup (POS).";
-         }
-         enum recp-192-group-25 {
-           value 25;
-           description
-             "recp-192-group-25 --> RFC_6989."+
-             " 192-bit Random ECP Group.";
-         }
-         enum recp-224-group-26 {
-           value 26;
-           description
-             "recp-224-group-26 --> RFC_6989."+
-             " 224-bit Random ECP Group.";
-         }
-       }
-       description
-         "Diffie-Hellman Groups (RFC 5996).";
-     }
-
-
-     /* Transform Type 5 (Extended Sequence Numbers
-        Transform ESN IDs) */
-     typedef extended-sequence-number-t {
-       type enumeration {
-         enum esn-none {
-           value 0;
-           description
-             "esn-none - Extended Sequence Number None --> RFC_7296.";
-         }
-         enum esn-1 {
-           value 1;
-           description
-             "esn-1 - Extended Sequence Number --> RFC_7296.";
-         }
-       }
-       description
-         "Extended Sequence Number (RFC 7296).";
-     }
-
-
-     typedef connection-type-t {
-       type enumeration {
-         enum initiator-only {
-           value 0;
-           description
-             "initiator-only: ME will act as initiator for"+
-             " bringing up IKEv2"+
-             " session with its IKE peer.";
-         }
-         enum responder-only {
-           value 1;
-           description
-             "responder-only: ME will act as responder for"+
-             " bringing up IKEv2"+
-             " session with its IKE peer.";
-         }
-         enum both {
-           value 2;
-           description
-             "both: ME can act as initiator or responder.";
-         }
-       }
-       description
-         "Connection type for IKE session.";
-     }
-
-     typedef transport-protocol-name-t {
-       type enumeration {
-         enum tcp {
-           value 1;
-           description
-             "Transmission Control Protocol (TCP) Transport Protocol.";
-         }
-         enum udp {
-           value 2;
-           description
-             "User Datagram Protocol (UDP) Transport Protocol";
-         }
-         enum sctp {
-           value 3;
-           description
-             "Stream Control Transmission Protocol (SCTP) Transport "+
-             "Protocol";
-         }
-         enum icmp {
-           value 4;
-           description
-             "Internet Control Message Protocol (ICMP) Transport "+
-             "Protocol";
-         }
-       }
-       description
-         "Enumeration of well known transport protocols.";
-     }
-
-     typedef preshared-key-t {
-       type string;
-       description
-         "Derived string used as Pre-Shared Key.";
-     }
-
-     typedef pad-type-t {
-       type enumeration {
-         enum dns-name {
-           value 1;
-           description
-             "DNS name (specific or partial)";
-         }
-         enum distinguished-name {
-           value 2;
-           description
-             "Distinguished Name (complete or sub-tree constrained)";
-         }
-         enum rfc-822 {
-           value 3;
-           description
-             "RFC 822 email address (complete or partially qualified)";
-         }
-         enum ipv4-range {
-           value 4;
-           description
-             "IPv4 Address Range";
-         }
-         enum ipv6-range {
-           value 5;
-           description
-             "IPv6 Address Range";
-         }
-         enum key-id {
-           value 6;
-           description
-             "Key ID (exact match only)";
-         }
-       }
-       description
-         "PAD Type";
-     }
-
-
-     /*-------------------------------------------------- */
-     /* draft-wang-ipsecme-ipsec-yang-00: ietf-ipsec-type */
-     /*-------------------------------------------------- */
-     typedef ipsec-mode {
-       type enumeration {
-         enum "transport" {
-           description
-             "Transport mode";
-         }
-         enum "tunnel" {
-           description
-             "Tunnel mode";
-         }
-       }
-       description
-         "type define of ipsec mode";
-     }
-
-     typedef ipsec-protocol {
-       type enumeration {
-         enum "ah" {
-           description
-             "AH Protocol";
-         }
-         enum "esp" {
-           description
-             "ESP Protocol";
-         }
-       }
-       description
-         "type define of ipsec security protocol";
-     }
-
-     typedef ipsec-spi {
-       type uint32 {
-         range "1..max";
-       }
-       description
-         "SPI";
-     }
-
-     typedef ipsec-spd-name {
-      type enumeration {
-       enum id_rfc_822_addr {
-           description
-             "Fully qualified user name string.";
-         }
-         enum id_fqdn {
-           description
-             "Fully qualified DNS name.";
-         }
-         enum id_der_asn1_dn {
-           description
-             "X.500 distinguished name.";
-         }
-         enum id_key {
-           description
-             "IKEv2 Key ID.";
-         }
-       }
-       description
-         "IPsec SPD name type";
-     }
-
-     typedef ipsec-traffic-direction {
-       type enumeration {
-         enum inbound {
-           description
-             "Inbound traffic";
-         }
-         enum outbound {
-           description
-             "Outbound traffic";
-         }
-       }
-       description
-         "IPsec traffic direction";
-     }
-
-     typedef ipsec-spd-operation {
-       type enumeration {
-         enum protect {
-           description
-             "PROTECT the traffic with IPsec";
-         }
-         enum bypass {
-           description
-             "BYPASS the traffic";
-         }
-         enum discard {
-           description
-             "DISCARD the traffic";
-         }
-       }
-       description
-         "The operation when traffic matches IPsec security policy";
-     }
-
-
-     /*---------------------------------------------------- */
-     /* draft-wang-ipsecme-ipsec-yang-00: ietf-ipsec-crypto */
-     /*---------------------------------------------------- */
-     typedef ipsec-authentication-algorithm {
-       type enumeration {
-         enum "null" {
-           value 0;
-           description
-             "null";
-         }
-         enum "md5" {
-           value 1;
-           description
-             "MD5 authentication algorithm";
-         }
-         enum "sha1" {
-           value 2;
-           description
-             "SHA1 authentication algorithm";
-         }
-         enum "sha2-256" {
-           value 3;
-           description
-             "SHA2-256 authentication algorithm";
-         }
-         enum "sha2-384" {
-           value 4;
-           description
-             "SHA2-384 authentication algorithm";
-         }
-         enum "sha2-512" {
-           value 5;
-           description
-             "SHA2-512 authentication algorithm";
-         }
-       }
-       description
-         "typedef for ipsec authentication algorithm";
-     }
-
-     typedef ipsec-encryption-algorithm {
-       type enumeration {
-         enum "null" {
-           description
-             "null";
-         }
-         enum "des" {
-           description
-             "DES encryption algorithm";
-         }
-         enum "3des" {
-           description
-             "3DES encryption algorithm";
-         }
-         enum "aes-128" {
-           description
-             "AES-128 encryption algorithm";
-         }
-         enum "aes-192" {
-           description
-             "AES-192 encryption algorithm";
-         }
-         enum "aes-256" {
-           description
-             "AES-256 encryption algorithm";
-         }
-       }
-       description
-        "typedef for ipsec encryption algorithm";
-     }
-
-     /*-------------------------------------------------- */
-     /* draft-wang-ipsecme-ike-yang-00: ietf-ipsec-type */
-     /*-------------------------------------------------- */
-     typedef ike-integrity-algorithm {
-       type enumeration {
-         enum "hmac-md5-96" {
-           description
-             "HMAC-MD5-96 Integrity Algorithm";
-         }
-         enum "hmac-sha1-96" {
-           description
-             "HMAC-SHA1-96 Integrity Algorithm";
-         }
-         enum "hmac-sha2-256" {
-           description
-             "HMAC-SHA2-256 Integrity Algorithm";
-         }
-         enum "hmac-sha2-384" {
-           description
-             "HMAC-SHA2-384 Integrity Algorithm";
-         }
-         enum "hmac-sha2-512" {
-           description
-             "HMAC-SHA2-512 Integrity Algorithm";
-         }
-       }
-       description
-         "typedef for ike integrity algorithm.";
-     }
-
-     typedef ike-encryption-algorithm {
-       type enumeration {
-         enum "des-cbc" {
-           description
-             "DES-CBC Encryption algorithm";
-         }
-         enum "3des-cbc" {
-           description
-             "3DES-CBC Encryption algorithm";
-         }
-         enum "aes-cbc-128" {
-           description
-             "AES-CBC-128 Encryption algorithm";
-         }
-         enum "aes-cbc-192" {
-           description
-             "AES-CBC-192 Encryption algorithm";
-         }
-         enum "aes-cbc-256" {
-           description
-             "AES-CBC-256 Encryption algorithm";
-         }
-       }
-       description
-         "typedef for ike encryption algorithm.";
-     }
-
-     typedef ike-prf-algorithm {
-       type enumeration {
-         enum "hmac-md5-96" {
-           description
-             "HMAC-MD5-96 PRF Algorithm";
-         }
-         enum "hmac-sha1-96" {
-           description
-             "HMAC-SHA1-96 PRF Algorithm";
-         }
-         enum "hmac-sha2-256" {
-           description
-             "HMAC-SHA2-256 PRF Algorithm";
-         }
-         enum "hmac-sha2-384" {
-           description
-             "HMAC-SHA2-384 PRF Algorithm";
-         }
-         enum "hmac-sha2-512" {
-           description
-             "HMAC-SHA2-512 PRF Algorithm";
-         }
-       }
-       description
-         "typedef for ike prf algorithm.";
-     }
-
-     typedef ike-dh-group {
-       type enumeration {
-         enum "dh-group-none" {
-           description
-             "None Diffie-Hellman group";
-         }
-         enum "dh-group-1" {
-           description
-             "768 bits Diffie-Hellman group";
-         }
-         enum "dh-group-2" {
-           description
-             "1024 bits Diffie-Hellman group";
-         }
-         enum "dh-group-5" {
-           description
-             "1536 bits Diffie-Hellman group";
-         }
-         enum "dh-group-14" {
-           description
-             "2048 bits Diffie-Hellman group";
-         }
-       }
-       description
-         "typedef for ike dh group";
-     }
-
-
-     typedef ike-peer-name-ref {
-       type leafref {
-         path "/ikev2/ike-peer/ike-peer-entries/peer-name";
-       }
-       description "reference to ike peer name";
-     }
-
-     typedef ike-proposal-number-ref {
-       type leafref {
-         path "/ikev2/proposal/name";
-       }
-       description "reference to ike proposal name";
-     }
-
-     typedef ipsec-proposal-name-ref{
-       type leafref {
-         path "/ipsec/proposal/ipsec-proposal/name";
-       }
-       description "reference to ike proposal name";
-     }
-
-     typedef ike-auth-method {
-       type enumeration {
-         enum pre-share {
-           description
-             "Select pre-shared key message as the
-              authentication method";
-         }
-         enum rsa-digital-signature {
-           description
-             "Select rsa digital signature as the
-              authentication method";
-         }
-         enum dss-digital-signature {
-           description
-             "Select dss digital signature as the
-              authentication method";
-         }
-       }
-       description "IKE authentication methods";
-     }
-
-     /*--------------------*/
-     /*   grouping         */
-     /*--------------------*/
-
-      /* The following groupings are used in both configuration data
-        and operational state data */
-     grouping name-grouping {
-       description
-         "This grouping provides a leaf identifying the name.";
-       leaf name {
-         type string;
-         description
-           "Name of a identifying.";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-     }
-
-     grouping sequence-number-grouping {
-       description
-         "This grouping provides a leaf identifying
-          a sequence number.";
-       leaf sequence-number {
-         type uint32 {
-           range "1..4294967295";
-         }
-         description
-           "Specify the sequence number.";
-       }
-     }
-
-     grouping description-grouping {
-       description
-         "description for free use.";
-       leaf description {
-         type string;
-         description
-           "description for free use.";
-       }
-     }
-
-     grouping traffic-selector-grouping {
-       description
-         "Traffic selector to be used for SA negotiation.";
-       leaf traffic-selector-id {
-         type string;
-         mandatory true;
-         description
-           "Traffic selector identifier.";
-       }
-       leaf protocol-name {
-         type transport-protocol-name-t;
-         description
-           "Specifies the protocol selector.";
-       }
-       leaf address-range {
-         type string;
-         mandatory true;
-         description
-           "Specifies the IPv4 or IPv6 address range.";
-       }
-     }
-
-
-
-     grouping ike-general-proposal-grouping {
-       description
-         "IKE proposal.";
-       leaf name {
-          type string;
-          mandatory true;
-          description
-            "IKE Proposal identify.";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-
-       leaf dh-group {
-         type diffie-hellman-group-t;
-         mandatory true;
-         description
-           "Specifies a Diffie-Hellman group.";
-       }
-       container encryption {
-         description
-           "Specify IKE Proposal encryption configuration";
-         leaf algorithm {
-            type ike-encryption-algorithm-t;
-            description
-              "Specifies an Encryption Algorithm.";
-         }
-       }
-     }
-
-     grouping ike-proposal-grouping {
-       description
-         "Configure the IKE Proposal";
-       uses ike-general-proposal-grouping;
-
-       leaf lifetime {
-         type uint32;
-          mandatory true;
-         description
-           "Configure lifetime for IKE SAs
-            0: for no timeout.
-            300 .. 99999999:  IKE SA lifetime in seconds.";
-       }
-       container authentication {
-         description
-           "Specify IKE Proposal authentication configuration";
-         leaf algorithm {
-           type ike-integrity-algorithm-t;
-           description
-             "Specify the authentication algorithm";
-         }
-         leaf preshared-key {
-           type empty;
-           description
-             "Use pre-shared key based authentication";
-         }
-         leaf rsa-signature {
-           type empty;
-           description
-             "Use signature based authentication by using
-              PKI certificates";
-         }
-       }
-     }
-
-     grouping ikev2-proposal-grouping {
-       description
-         "Holds an IKEv2 transform proposal used during "+
-         "IKEv2 SA negotiation.  Multiple IKEv2 Transforms "+
-         " can be proposed during an IKEv2 session initiation "+
-         "in an ordered list.";
-       uses ike-general-proposal-grouping;
-
-       leaf pseudo-random-function {
-         type pseudo-random-function-t;
-         mandatory true;
-         description
-           "Specifies Pseudo Random Function for IKEv2 key exchange";
-       }
-       container authentication {
-         description
-           "Specify IKEv2 Proposal authentication configuration";
-         leaf algorithm {
-           type ike-integrity-algorithm-t;
-           description
-             "Specify the authentication algorithm";
-         }
-       }
-     }
-
-     grouping ipsec-proposal-grouping {
-       description
-         "Configure IPSec Proposal";
-       leaf name {
-          type string;
-          mandatory true;
-          description
-            "IPSec proposal identifier.";
-       }
-       leaf ah {
-         type ike-integrity-algorithm-t;
-         description
-           "Configure Authentication Header (AH).";
-       }
-       container esp {
-         description
-           "Configure Encapsulating Security Payload (ESP).";
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "Configure ESP authentication";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Configure ESP encryption";
-         }
-       }
-       leaf ip-comp{
-         type empty;
-         description
-           "Enable IPSec proposal IP-COMP which uses the IP Payload "+
-           "compression protocol to compress IP Security (IPSec) "+
-           "packets before encryption";
-       }
-       container lifetime {
-         description
-           "Configure lifetime for IPSEC SAs";
-         leaf kbytes {
-           type uint32 {
-             range "128..2147483647";
-           }
-           description
-             "Enter lifetime kbytes for IPSEC SAs";
-         }
-         leaf seconds {
-           type uint32 {
-             range "300..99999999";
-           }
-           description
-             "Enter lifetime seconds for IPSEC SAs
-             0: lifetime of 0 for no timeout
-             300..99999999: IPSec SA lifetime in seconds";
-         }
-       }
-     }
-
-     grouping identity-grouping {
-       description
-         "Identification type. It is an union identity, "+
-         "possible type as follows: "+
-         "a) ID_FQDN: A fully-qualified domain name string. "+
-         "  An example of a ID_FQDN is, example.com. "+
-         "  The string MUST not contain any terminators "+
-         "(e.g., NULL, CR, etc.). "+
-         "b) ID_RFC822_ADDR: A fully-qualified RFC822 email "+
-         "   address string, An example of a ID_RFC822_ADDR is, "+
-         "   jsmith@example.com. The string MUST not contain "+
-         "   any terminators. "+
-         "c) ID_IPV4_ADDR: A single four (4) octet IPv4 address. "+
-         "d) ID_IPV6_ADDR: A single sixteen (16) octet IPv6 address. "+
-         "e) DN_X509: Distinguished name in the X.509 tradition.";
-       choice identity {
-         description
-           "Choice of identity.";
-         leaf ipv4-address {
-           type inet:ipv4-address;
-           description
-             "Specifies the identity as a single four (4)
-              octet IPv4 address.
-              An example is, 10.10.10.10. ";
-         }
-         leaf ipv6-address {
-           type inet:ipv6-address;
-           description
-             "Specifies the identity as a single sixteen (16) "+
-             "octet IPv6 address. "+
-             "An example is, "+
-             "FF01::101, 2001:DB8:0:0:8:800:200C:417A .";
-         }
-         leaf fqdn-string {
-/*           type inet:domain-name; */
-           type string {
-             pattern
-               '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
-               + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
-               + '|\.';
-             length "1..253";
-           }
-           description
-             "Specifies the identity as a Fully-Qualified
-              Domain Name (FQDN) string.
-              An example is: example.com.
-              The string MUST not contain any terminators
-              (e.g., NULL, CR, etc.).";
-         }
-         leaf rfc822-address-string {
-           type string;
-           description
-             "Specifies the identity as a fully-qualified RFC822
-              email address string.
-              An example is, jsmith@example.com.
-              The string MUST not contain any terminators
-              (e.g., NULL, CR, etc.).";
-         }
-         leaf dnX509 {
-           type string;
-           description
-             "Specifies the identity as a distinguished name
-              in the X.509 tradition.";
-         }
-       }
-     } /* grouping identity-grouping */
-
-     grouping ike-general-policy-profile-grouping {
-       description
-         "IKE policy.";
-       leaf connection-type {
-         type connection-type-t;
-         mandatory true;
-         description
-           "Specify the IKE connection type";
-       }
-       leaf pre-shared-key {
-         type union {
-           type string {
-             length "16";
-           }
-           type string {
-             length "40";
-             pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-           }
-/*           type yang:hex-string {
-             length "40";
-           }*/
-         }
-         description
-           "Specify IKE pre-shared-key value";
-       }
-       leaf validate-certificate-identity {
-         type empty;
-         description
-           "Validate Remote-ID payload against the
-           ID's available in the certificate";
-       }
-       list seq {
-         key seq-id;
-         description
-           "list of sequence of policy.";
-         leaf seq-id {
-           type uint32 {
-             range "1..429496729";
-           }
-           description
-             "Sequence Number";
-         }
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev1/eipsec:proposal"+
-                  "/eipsec:name";
-           }
-           description
-             "IKE Proposal reference.";
-         }
-       }
-       container identity {
-         description
-           "Specify IKE identity value";
-         container local {
-           description
-             "Specify the identity of the local IP Security (IPSec)
-             tunnel endpoint in an Internet Key Exchange (IKE)
-             policy to use when negotiating IKE request with a
-             remote peer.";
-           uses identity-grouping;
-         }
-         container remote {
-           description
-             "Specify the identity of the remote IP Security (IPSec)
-             tunnel endpoint in an
-              Internet Key Exchange (IKE) policy to use when
-              negotiating IKE request with a remote peer.";
-           uses identity-grouping;
-         }
-       }
-     }
-
-     grouping ike-policy-mode-grouping {
-       description
-         "IKE Policy Mode";
-       container mode {
-         description
-           "Specify IKE mode configuration";
-         leaf aggressive {
-           type empty;
-           description
-             "Set IKE Aggressive mode";
-         }
-         leaf main {
-           type empty;
-           description
-             "Set IKE Main mode";
-         }
-       }
-     }
-
-     grouping ike-policy-profile-grouping {
-       description
-         "Configure IKE policy";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "Specify an IKE policy name";
-       }
-       uses ike-policy-mode-grouping;
-       uses ike-general-policy-profile-grouping;
-     }
-
-     grouping ikev2-policy-profile-grouping {
-       description
-         "Common information for multiple IKE sessions
-         to be instantiated on a managed element.;
-          One or more Ikev2Session instances might refer
-          to this instance.";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "Value component of the RDN.";
-       }
-       container authentication {
-         description
-           "Specify IKE Proposal authentication configuration";
-         leaf preshared-key {
-           type empty;
-           description
-             "Use pre-shared key based authentication";
-         }
-         leaf rsa-signature {
-           type empty;
-           description
-             "Use signature based authentication by using
-             PKI certificates";
-         }
-       }
-       leaf lifetime {
-         type uint32;
-         mandatory true;
-         description
-           "Configure lifetime for IKE SAs
-            0: for no timeout.
-            300 .. 99999999:  IKE SA lifetime in seconds.";
-       }
-
-       container address-allocation {
-         must "../connection-type = 'responder-only'" {
-           description
-             "address-allocation can be configured only with
-             responder-only in ike2 policy";
-         }
-         leaf aaa {
-           type empty;
-           description
-             "IRAC address allocation by AAA";
-         }
-         description
-           "Specify IKE IRAS address allocation option";
-       }
-       uses ike-general-policy-profile-grouping;
-
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-     }
-
-     grouping ipsec-policy-grouping {
-       description
-         "Holds configuration information for IPSec policies.";
-       leaf name {
-         type string;
-         mandatory true;
-         description
-           "IPSec Policy Identification";
-       }
-       leaf description {
-         type string;
-         description
-           "Specify the description.";
-       }
-
-       leaf anti-replay-window {
-         type uint32 {
-           range "0..1024";
-         }
-         description
-           "Configure replay window size
-           0: to disable anti-replay-window
-           32..1024: IPSec anti-replay-window size in multiple of 32";
-       }
-       container perfect-forward-secrecy {
-         description
-           "Configure Perfect Forward Secrecy (PFS) for IPSec Policy";
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           description
-             "Configure Diffie-Hellman group for
-              perfect-forward-secrecy";
-         }
-       }
-       list seq {
-         key seq-id;
-         description
-           "Specify IPSEC proposal sequence number";
-         leaf seq-id {
-           type uint32;
-           description
-             "Sequence ID";
-         }
-         leaf description {
-           type string;
-           description
-             "Specify the description.";
-         }
-
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ipsec/"+
-                  "eipsec:proposal/eipsec:ipsec-proposal/eipsec:name";
-           }
-           description
-             "IKE proposal reference.";
-         }
-       }
-     }
-
-     grouping key-string-grouping {
-       description
-         "Configure key for authentication algorithm";
-       leaf key-str {
-         type union {
-           type string {
-             length "16";
-           }
-           type string {
-             length "40";
-             pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-           }
-/*           type yang:hex-string {
-             length "40";
-           }*/
-         }
-         description
-           "Key string input is either string value (length of 16)
-           or hexadecimal (length of 40)";
-       }
-     }
-
-     grouping ipsec-sa-ah-grouping {
-       description
-         "Configure Authentication Header (AH) for
-          Security Association (SA)";
-       container ah {
-         description
-           "Configure Authentication Header (AH) for SA";
-         choice authentication-algorithm {
-           description
-             "choice for authentication algorithm to set for AH";
-           case hmac-aes-xcbc {
-             container hmac-aes-xcbc {
-               description
-                 "Set the authentication algorithm to hmac-aes-xcbc";
-               uses key-string-grouping;
-             }
-           }
-           case hmac-md5-96 {
-             container hmac-md5-96 {
-               description
-                 "Set the authentication algorithm to hmac-md5-96";
-               uses key-string-grouping;
-             }
-           }
-           case hmac-sha1-96 {
-             container hmac-sha1-96 {
-               description
-                 "Set the authentication algorithm to hmac-sha1-96";
-               uses key-string-grouping;
-             }
-           }
-           case key-string {
-             container key-string {
-               description
-                 "Configure key for authentication algorithm";
-               uses key-string-grouping;
-             }
-           }
-         }
-       }
-     }
-
-     grouping ipsec-sa-esp-grouping {
-       description
-         "Configure IPSec Encapsulation Security Payload (ESP)";
-       container esp {
-         description
-           "Set IPSec Encapsulation Security Payloer (ESP)";
-         container authentication {
-           description
-             "Configure authentication for IPSec
-              Encapsulation Secutiry Payload (ESP)";
-           choice authentication-algorithm {
-             description
-               "choice for authentication algorithm to set";
-             case hmac-aes-xcbc {
-               container hmac-aes-xcbc {
-                 description
-                   "Set the authentication algorithm to hmac-aes-xcbc";
-                 uses key-string-grouping;
-               }
-             }
-             case hmac-md5-96 {
-               container hmac-md5-96 {
-                 description
-                   "Set the authentication algorithm to hmac-md5-96";
-                 uses key-string-grouping;
-               }
-             }
-             case hmac-sha1-96 {
-               container hmac-sha1-96 {
-                 description
-                   "Set the authentication algorithm to hmac-sha1-96";
-                 uses key-string-grouping;
-               }
-             }
-             case key-string {
-               container key-string {
-                 description
-                   "Configure key for authentication algorithm";
-                 uses key-string-grouping;
-               }
-             }
-           }
-         }
-         container encryption {
-           description
-             "Configure encryption for IPSec
-              Encapsulation Secutiry Payload (ESP)";
-           choice encryption-algorithm {
-             description
-               "type of encryption";
-             case des3-cbc {
-               container des3-cbd {
-                 description
-                   "Set the encryption algorithm to des3-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-128-cbc {
-               container aes-128-cbc {
-                 description
-                   "Set the encryption algorithm to aes-128-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-192-cbc {
-               container aes-192-cbc {
-                 description
-                   "Set the encryption algorithm to aes-192-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case aes-256-cbc {
-               container aes-256-cbc {
-                 description
-                   "Set the encryption algorithm to aes-256-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case des-cbc {
-               container des-cbc {
-                 description
-                   "Set the encryption algorithm to des-cbc";
-                 uses key-string-grouping;
-               }
-             }
-             case key-string {
-               container key-string {
-                 description
-                   "Configure key for encryption algorithm";
-                 uses key-string-grouping;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-dest-grouping {
-       description
-         "IPSEC ACL destination.";
-       /* For destination */
-       choice dest-address {
-         description
-           "destination address.";
-         case dest-ipv4-address {
-           leaf destination-ipv4-address {
-             type inet:ipv4-address;
-             description
-               "Destination IPv4 Address A.B.C.D/0..32.";
-           }
-         }
-         case dest-any {
-           leaf dest-any {
-             type empty;
-             description
-               "Match Any Destination IPv4 Address.";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-seq-protocol-number-grouping {
-       description
-         "IPSec ACL Sequence protocol number.";
-       leaf number {
-         type uint16 {
-           range "0..255";
-         }
-         description
-           "Specify protocol number.";
-       }
-       choice argument {
-         description
-           "Source IPv4 address.";
-         case source-ipv4-address {
-           leaf source-ipv4-address {
-             type inet:ipv4-address;
-             description
-               "Source IPv4 Address A.B.C.D/0..32.";
-           }
-         }
-         case any {
-           /* For source */
-           leaf source-any {
-             type empty;
-             description
-               "Match Any Source IPv4 Address.";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-acl-seq-ip-address-grouping {
-       description
-         "IPSec ACL Sequence IP Address.";
-       leaf source-ipv4-address {
-         type inet:ipv4-address;
-         description
-           "Source is IPv4 Address A.B.C.D/0..32.";
-       }
-     }
-
-     grouping ipsec-acl-seq-any-grouping {
-       description
-         "IPSec ACL Sequence Any.";
-       leaf any {
-         type empty;
-         description
-           "Source is Any.";
-       }
-     }
-
-     grouping ipsec-acl-seq-tcp-grouping {
-       description
-         "IPSec ACL Sequence TCP.";
-       leaf tcp {
-         type empty;
-         description
-           "Source is TCP protocol.";
-       }
-     }
-
-     grouping ipsec-acl-seq-udp-grouping {
-       description
-         "IPSec ACL Sequence for UDP.";
-       leaf udp {
-         type empty;
-         description
-           "Source is UDP protocol.";
-       }
-     }
-
-     grouping ipsec-acl-grouping {
-       description
-         "IPSec ACL";
-       list access-list {
-         if-feature ipsec-acl;
-         key "name sequence-number";
-         uses name-grouping;
-         uses sequence-number-grouping;
-         description
-           "Configure the IPSec access-list.";
-         choice protocol {
-           description
-             "IPSec ACL protocol.";
-           case number {
-             uses ipsec-acl-seq-protocol-number-grouping;
-           }
-           case source-ipv4-address {
-             uses ipsec-acl-seq-ip-address-grouping;
-           }
-           case any {
-             uses ipsec-acl-seq-any-grouping;
-           }
-           case tcp {
-             uses ipsec-acl-seq-tcp-grouping;
-           }
-           case udp {
-             uses ipsec-acl-seq-udp-grouping;
-           }
-         }
-         uses ipsec-acl-dest-grouping;
-       }
-     }
-
-     grouping ipsec-df-bit-grouping {
-       description
-         "IPSec Dont Fragment (DF) bit for IP header.";
-       container df-bit {
-         description
-           "Configure Don't Fragment (DF) bit for IP Header.";
-         leaf clear {
-           type empty;
-           description
-             "Clear DF bit for outer IP header.";
-         }
-         leaf propagate {
-           type empty;
-           description
-             "Propagate DF bit for outer IP header.";
-         }
-         leaf set {
-           type empty;
-           description
-             "Set DF bit for outer IP header.";
-         }
-       }
-     }
-
-     grouping ipsec-profile-grouping {
-       description
-         "IPSec profile.";
-       list profile {
-         key "name";
-         uses name-grouping;
-         uses ipsec-df-bit-grouping;
-         description
-           "Configure the IPSec Profile.";
-         leaf mtu {
-           type uint32 {
-             range "256..1600";
-           }
-           description
-             "Set the MTU.";
-         }
-         list seq {
-           key "sequence-number";
-           uses sequence-number-grouping;
-           description
-             "IPSec Access List sequence number.";
-           leaf policy {
-             type leafref {
-               path "/eipsec:ipsec/eipsec:policy"+
-                    "/eipsec:ipsec-policy/eipsec:name";
-             }
-             description
-               "Specify IPSec policy name.";
-           }
-         }
-       }
-     }
-
-
-     grouping ip-address-grouping {
-       description
-         "IP Address grouping";
-
-       choice ip-address {
-         description
-           "Choice of IPv4 or IPv6.";
-         leaf ipv4-address {
-           type inet:ipv4-address;
-           description
-             "Specifies the identity as a single four (4)
-              octet IPv4 address.
-              An example is, 10.10.10.10. ";
-         }
-         leaf ipv6-address {
-           type inet:ipv6-address;
-           description
-             "Specifies the identity as a single sixteen (16) "+
-             "octet IPv6 address. "+
-             "An example is, "+
-             "FF01::101, 2001:DB8:0:0:8:800:200C:417A .";
-         }
-       }
-     }
-
-     grouping ipsec-sa-grouping {
-       description
-         "Configure Security Association (SA)";
-       leaf spi {
-         type uint32;
-         description
-           "Specify Security Parameter Index";
-       }
-       leaf anti-replay-window {
-         type uint16 {
-           range "0..1024";
-         }
-         description
-           "Specify replay window size";
-       }
-       leaf ip-comp {
-         type empty;
-         description
-           "Enables IPCOMP, which uses the IP payload compression
-            protocol to compress IP security (IPsec) packets
-            before encryption";
-       }
-
-       container local-peer {
-         description
-           "Specify the local peer IP address";
-         uses ip-address-grouping;
-       }
-       container remote-peer {
-         description
-           "Specify the remote peer IP address";
-         uses ip-address-grouping;
-       }
-       leaf sa-mode {
-         type ipsec-mode;
-         description
-           "SA Mode: tunnel or transport mode";
-       }
-       leaf security-protocol {
-         type ipsec-protocol;
-         description
-           "Security protocol of IPsec SA: Either AH or ESP.";
-       }
-       leaf sequence-number {
-         type uint64;
-         description
-           "Current sequence number of IPsec packet.";
-       }
-       leaf sequence-number-overflow-flag {
-         type boolean;
-         description
-           "The flag indicating whether overflow of the sequence
-            number counter should prevent transmission of additional
-            packets on the SA, or whether rollover is permitted.";
-       }
-       leaf path-mtu {
-         type uint16;
-         description
-           "maximum size of an IPsec packet that can be transmitted
-            without fragmentation";
-       }
-       container life-time {
-         leaf life-time-in-seconds {
-           type uint32;
-           description
-             "SA life time in seconds";
-         }
-         leaf remain-life-time-in-seconds {
-           type uint32;
-           description
-             "Remain SA life time in seconds";
-         }
-         leaf life-time-in-byte {
-           type uint32;
-           description
-             "SA life time in bytes";
-         }
-         leaf remain-life-time-in-byte {
-           type uint32;
-           description
-             "Remain SA life time in bytes";
-         }
-         description
-           "SA life time information";
-       }
-       leaf upper-protocol {
-         type string;
-         description
-           "Upper-layer protocol to be used";
-       }
-       leaf direction {
-         type ipsec-traffic-direction;
-         description
-           "It indicates whether the SA is inbound SA or
-            out bound SA.";
-       }
-       container source-address {
-         description
-           "Specify the source IP address and
-            port of protected traffic";
-         uses ip-address-grouping;
-         leaf port-number {
-           type uint32;
-           description
-             "port of protected traffic";
-         }
-       }
-       container destination-address {
-         description
-           "Specify the destination IP address and
-            port of protected traffic";
-         uses ip-address-grouping;
-         leaf port-number {
-           type uint32;
-           description
-             "port of protected traffic";
-         }
-       }
-       leaf nat-traversal-flag {
-         type boolean;
-         description
-           "Whether the SA is used to protect traffic that needs
-            nat traversal";
-       }
-       uses ipsec-sa-ah-grouping;
-       uses ipsec-sa-esp-grouping;
-     }
-
-
-     /* draft-wang-ipsecme-ike-yang-00 */
-     grouping ipsec-common-configuration {
-       choice df-flag {
-         default copy;
-         case set {
-           leaf set {
-             type empty;
-             description
-               "Set the df bit when encapsulate IPsec tunnel.";
-           }
-         }
-         case clear {
-           leaf clear {
-             type empty;
-             description
-               "Clear the df bit when encapsulate IPsec tunnel.";
-           }
-         }
-         case copy {
-           leaf copy {
-             type empty;
-             description
-               "Copy the inner IP header df bit.";
-           }
-         }
-         description
-           "It indicates how to process the df bit when encapsulate
-            IPsec tunnel.";
-       }
-       leaf stateful-frag-check {
-         type boolean;
-         default false;
-         description "Whether stateful fragment checking applies.";
-       }
-       leaf life-time-kb {
-         type uint32;
-         units "KB";
-         default 2000000;
-         description "IPsec SA Life time in KB.";
-       }
-       leaf life-time-second {
-         type uint32;
-         units "Second";
-         default 18400;
-         description "IPsec SA Life time in Seconds";
-       }
-       choice anti-replay {
-         default enable;
-         case enable {
-           leaf enable {
-             type empty;
-             description "Enable Anti-replay";
-           }
-           choice anti-replay-windows-size {
-             case size-32;
-             case size-64;
-             case size-128;
-             case size-256;
-             case size-512;
-             case size-1024;
-             default size-1024;
-             description "It indicate the size of anti-replay window";
-           }
-         }
-         case disable {
-           leaf disable {
-             type empty;
-             description "Disable Anti-replay";
-           }
-         }
-         description "Whether enable or disable anti-replay";
-       }
-       leaf inbound-dscp {
-         type uint16 {
-           range "0..63";
-         }
-         default 0;
-         description "Inbound DSCP value";
-       }
-       leaf outbound-dscp {
-         type uint16 {
-           range "0..63";
-         }
-         default 0;
-         description "Outbound DSCP value";
-       }
-       description "Common IPsec configurations";
-     }
-
-     /*--------------------*/
-     /* Configuration Data */
-     /*--------------------*/
-     container ikev1 {
-       if-feature ikev1;
-       description
-         "Configuration IPSec IKEv1";
-       /* The following is for <configure> */
-       list proposal {
-          key "name";
-          uses ike-proposal-grouping;
-          description
-            "Configure IKE proposal";
-       }
-       leaf keepalive {
-         type empty;
-         description
-           "Enables sending Dead Peer Detection (DPD) messages "+
-           "to Internet Key Exchange (IKE) peers.";
-       }
-       list policy {
-         key "name";
-         uses ike-policy-profile-grouping;
-         description
-           "Configure IKE Policy Profile.";
-       }
-     }
-
-     container ikev2 {
-       if-feature ikev2;
-       description
-         "Configuration IPSec IKEv2";
-       /* The following is for <configure> */
-       /* draft-wang-ipsecme-ike-yang-00 */
-       container ike-global-configuration {
-         if-feature ikev2-global;
-         description "Global IKE configurations";
-         uses ipsec-common-configuration;
-         leaf local-name {
-           type string;
-           description
-             "Global local name configuration, if it is not configed,
-              ip address will be used as default. If configing special
-              local name for special peer, it will overwrite the global
-              name configuration when negotion with that peer.";
-         }
-         leaf nat-keepalive-interval {
-           type uint16 {
-             range "5..300";
-           }
-           units "Seconds";
-           default 20;
-           description "Global nat keepalive interval";
-         }
-         leaf dpd-interval {
-           type uint16 {
-             range "10..3600";
-           }
-           units "Seconds";
-           default 30;
-           description "Global DPD interval";
-         }
-       }
-       container ike-peer {
-         if-feature ikev2-peer;
-         description "IKE peer information";
-         list ike-peer-entries {
-           key "peer-name";
-           description "IKE peer information";
-           leaf peer-name {
-             type string;
-             mandatory true;
-             description "Name of IKE peer";
-           }
-           leaf ike-proposal-number {
-             type ike-proposal-number-ref;
-             description "IKE proposal number referenced by IKE peer";
-           }
-           leaf PresharedKey {
-             type string;
-             description "Preshare key";
-           }
-           leaf nat-traversal {
-             type boolean;
-             default false;
-             description "Enable/Disable nat traversal";
-           }
-           choice local-id-type {
-             default ip;
-             case ip {
-               leaf ip {
-                 type empty;
-                 description "IP address";
-               }
-             }
-             case fqdn {
-               leaf fqdn {
-                 type empty;
-                 description "Fully Qualifed Domain name ";
-               }
-             }
-             case dn {
-               leaf dn {
-                 type empty;
-                 description "Domain name";
-               }
-             }
-             case user_fqdn {
-               leaf user_fqdn {
-                 type empty;
-                 description "User FQDN";
-               }
-             }
-             description "Local ID type";
-           }
-           leaf local-id {
-             type string;
-             description
-               "Local ID Name. When IP is used as local ID type,
-                it is ignored. If it is not configurated,
-                global local name will be used.";
-           }
-           leaf remote-id {
-             type "string";
-             description "ID of IKE peer";
-           }
-           leaf low-remote-address {
-             type inet:ip-address;
-             description "Low range of remote address";
-           }
-           leaf high-remote-address {
-             type inet:ip-address;
-             description "High range of remote address";
-           }
-           leaf certificate {
-             type string;
-             description "Certificate file name";
-           }
-           leaf auth-address-begin {
-             type inet:ip-address;
-             description
-               "The begin range of authenticated peer address";
-           }
-           leaf auth-address-end {
-             type inet:ip-address;
-             description
-               "The end range of authenticated peer address";
-           }
-         }
-       }//End of IKEPeerEntries
-
-
-       list proposal {
-          if-feature ikev2-proposal;
-          key "name";
-          uses ikev2-proposal-grouping;
-          description
-            "Configure IKEv2 proposal";
-       }
-       list policy {
-         if-feature ikev2-policy;
-         key "name";
-         uses ikev2-policy-profile-grouping;
-         description
-           "IKEv2 Policy Profile";
-       }
-     }
-
-     container ipsec {
-       if-feature ipsec;
-       description
-         "Configuration IPsec";
-       container sad {
-         if-feature ipsec-sad;
-         description
-           "Configure the IPSec Security Association Database (SAD)";
-         list sad-entries {
-           key "spi direction";
-           description
-             "Configure IPsec Security Association Database(SAD)";
-           uses ipsec-sa-grouping;
-         }
-       }
-       container proposal {
-         if-feature ipsec-proposal;
-         description
-           "IPSec Proposal Profile";
-         list ipsec-proposal {
-           key "name";
-           uses ipsec-proposal-grouping;
-           description
-             "Configure the IP Security (IPSec) proposal";
-         }
-       }
-       container spd {
-         if-feature ipsec-spd;
-         description
-           "Configure the Security Policy Database (SPD)";
-         list spd-entries {
-           key "name";
-           ordered-by user;
-           uses ipsec-policy-grouping;
-           description
-             "Specify an IPSec policy name";
-         }
-       }
-       container pad {
-         description
-           "Configure Peer Authorization Database (PAD)";
-         list pad-entries {
-           key "pad-type pad-id";
-           ordered-by user;
-           uses identity-grouping;
-           description
-             "Peer Authorization Database (PAD)";
-           leaf pad-id {
-             type uint32;
-              description
-                "PAD identity";
-           }
-           leaf pad-type {
-             type pad-type-t;
-             description
-               " PAD type";
-           }
-           leaf ike-peer-name {
-             type string;
-             description
-               "IKE Peer Name";
-           }
-           container peer-authentication {
-             description
-               "Specify IKE peer authentication configuration";
-             leaf algorithm {
-               type ike-integrity-algorithm-t;
-               description
-                 "Specify the authentication algorithm";
-             }
-             leaf preshared-key {
-               type empty;
-               description
-                 "Use pre-shared key based authentication";
-             }
-             leaf rsa-signature {
-               type empty;
-               description
-                 "Use signature based authentication by using
-                  PKI certificates";
-             }
-           }
-         }
-       }
-     }
-
-
-
-     /*--------------------------*/
-     /* Operational State Data   */
-     /*--------------------------*/
-     grouping ike-proposal-state-components {
-       description
-         "IKE Proposal operational state";
-       list proposal {
-         if-feature ike-proposal-state;
-         description
-           "Operational data for IKE Proposal";
-         leaf name {
-           type string {
-             length "1..50";
-           }
-           description
-             "Name of the IKE proposal.";
-         }
-         leaf lifetime {
-           type uint32;
-           units "seconds";
-           description
-             "lifetime";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Encryption algorithm";
-         }
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           description
-             "Diffie-Hellman group.";
-         }
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "authentication";
-         }
-       }
-     }
-
-     grouping ike-policy-state-grouping {
-       description
-         "IKE Policy State.";
-       list policy {
-         if-feature ike-policy-state;
-         description
-           "Operational data for IKE policy";
-         leaf name {
-           type string {
-             length "1..50";
-           }
-           description
-             "Name of the IKE Policy.";
-         }
-         leaf description {
-           type string;
-           description
-             "Description for IKE Policy.";
-         }
-         leaf mode {
-           type enumeration {
-             enum aggressive {
-               description
-                 "Aggressive mode.";
-             }
-             enum main {
-               description
-                 "Main mode.";
-             }
-           }
-           description
-             "IKE policy mode.";
-         }
-         leaf connection-type {
-           type connection-type-t;
-           description
-             "IKE policy connection type.";
-         }
-         leaf local-identity {
-           type inet:ipv4-address-no-zone;
-           description
-             "IP address of the local identity.";
-         }
-         leaf remote-identity {
-           type inet:ipv4-address-no-zone;
-           description
-             "IP address of the remote identity.";
-         }
-         leaf pre-shared-key {
-           type string;
-           description
-             "Pre-shared key";
-         }
-         leaf seq {
-           type uint32;
-           description
-             "sequence number";
-         }
-         leaf proposal {
-           type string;
-           description
-             "proposal name";
-         }
-       }
-     }
-
-     grouping ikev2-proposal-state-components {
-       description
-         "IKEv2 Operational state";
-       list proposal {
-         if-feature ikev2-proposal-state;
-         description
-           "IKEv2 proposal operational data";
-         leaf name {
-           type string;
-           description
-             "Name of IKEv2 Proposal.";
-         }
-         leaf pseudo-random-function {
-           type pseudo-random-function-t;
-           description
-             "Pseudo Random Function for IKEv2.";
-         }
-         leaf authentication {
-           type ike-integrity-algorithm-t;
-           description
-             "authentication";
-         }
-         leaf encryption {
-           type ike-encryption-algorithm-t;
-           description
-             "Encryption algorithm";
-         }
-         leaf dh-group {
-           type diffie-hellman-group-t;
-           mandatory true;
-           description
-             "Diffie-Hellman group.";
-         }
-       }
-     }
-
-     grouping ipsec-policy-state-grouping {
-       description
-         "IPSec operational state";
-       list policy {
-         if-feature ipsec-policy-state;
-         description
-           "IPSec policy operational data";
-         leaf name {
-           type string;
-           description
-             "IPSec Policy name.";
-         }
-         leaf anti-replay-window {
-           type uint32;
-           description
-             "replay window size";
-         }
-         leaf perfect-forward-secrecy {
-           type diffie-hellman-group-t;
-           description
-             "Diffie-Hellman group for perfect-forward-secrecy";
-         }
-         list seq {
-           description
-             "Sequence number";
-           leaf seq-id {
-             type uint32;
-             description
-               "Sequence number";
-           }
-           leaf proposal-name {
-             type string;
-             description
-               "IPSec proposal name";
-           }
-         }
-       }
-     }
-     grouping ipsec-proposal-state-grouping {
-       description
-         "IPSec proposal operational data";
-       list proposal {
-         if-feature ipsec-proposal-state;
-         description
-           "IPSec proposal operational data";
-         leaf name {
-           type string;
-           description
-             "IPSec Proposal name";
-         }
-         leaf ah {
-           type ike-integrity-algorithm-t;
-           description
-             "Authentication Header (AH).";
-         }
-         container esp {
-           description
-             "Encapsulating Security Payload (ESP).";
-           leaf authentication {
-             type ike-integrity-algorithm-t;
-             description
-               "ESP authentication";
-           }
-           leaf encryption {
-             type ike-encryption-algorithm-t;
-             description
-               "ESP encryption";
-           }
-         }
-         leaf ip-comp{
-           type empty;
-           description
-             "IPSec proposal IP-COMP which uses the IP Payload "+
-             "compression protocol to compress IP Security (IPSec) "+
-             "packets before encryption";
-         }
-         container lifetime {
-           description
-             "lifetime for IPSEC SAs";
-           leaf kbytes {
-             type uint32;
-             description
-               "lifetime kbytes for IPSEC SAs";
-
-           }
-           leaf seconds {
-             type uint32;
-             description
-               "lifetime seconds for IPSEC SAs";
-           }
-         }
-       }
-     }
-
-     grouping ipsec-alarms-state-grouping {
-       description
-         "IPSec alarms operational data";
-       leaf hold-down {
-         if-feature ipsec-alarms-state;
-         type uint32;
-         description
-           "Hold-down value";
-       }
-     }
-
-     grouping ipsec-sa-ah-state-grouping {
-       description
-         "IPSec SA's AH operational data";
-
-       leaf spi {
-         if-feature ipsec-sa-ah-state;
-         type uint32;
-         description
-           "Security Parameter Index (SPI) value";
-       }
-       leaf description {
-         if-feature ipsec-sa-ah-state;
-         type string;
-         description
-           "the description.";
-       }
-       leaf authentication-algorithm {
-         if-feature ipsec-sa-ah-state;
-         type ike-integrity-algorithm-t;
-         description
-           "Authentication algorithm";
-       }
-       leaf encryption-algorithm {
-         if-feature ipsec-sa-ah-state;
-         type ike-encryption-algorithm-t;
-         description
-           "Encryption algorithm";
-       }
-     }
-
-     grouping ipsec-sa-state-grouping {
-       description
-         "IPSec Security Association Operational data";
-       list sa {
-         if-feature ipsec-sa-state;
-         description
-           "IPSec SA operational data";
-         leaf name {
-           type string;
-           description
-             "Specify IPSec Security Association (SA) name";
-         }
-         leaf anti-replay-window {
-           type uint16;
-           description
-             "replay window size";
-         }
-         leaf ip-comp {
-           type empty;
-           description
-             "Enables IPCOMP, which uses the IP payload compression
-              protocol to compress IP security (IPsec) packets before
-              encryption";
-         }
-         uses ipsec-sa-ah-state-grouping;
-       }
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     grouping ipsec-tunnel-mode-info {
-       description
-         "common infomations when using IPsec tunnel mode";
-       leaf local-address {
-         if-feature ipsec-tunnel;
-         type string;
-         description
-           "Local address of IPsec tunnel mode";
-       }
-       leaf remote-address {
-         if-feature ipsec-tunnel;
-         type string;
-         description
-           "Remote address of IPsec tunnel mode";
-       }
-       leaf bypass-df {
-         if-feature ipsec-tunnel;
-         type enumeration {
-           enum "set" {
-             description
-               "Set the df bit";
-           }
-           enum "clear" {
-             description
-               "Clear the df bit";
-           }
-           enum "copy" {
-             description
-               "Copy the df bit from inner header";
-           }
-         }
-         description
-           "This flag indicates how to process tunnel mode df flag";
-       }
-       leaf dscp-flag {
-         if-feature ipsec-tunnel;
-         type boolean;
-         description
-           "This flag indicate whether bypass DSCP or map to
-            unprotected DSCP values (array) if needed to
-            restrict bypass of DSCP values.";
-       }
-       leaf stateful-frag-check-flag {
-         if-feature ipsec-tunnel;
-         type boolean;
-         description
-           "This flag indicates whether stateful fragment checking
-            will be used.";
-       }
-     }
-     grouping traffic-selector {
-       description
-         "IPsec traffic selector information";
-       leaf local-address-low {
-         if-feature ipsec-local-address-range;
-         type inet:ip-address;
-         description
-           "Low range of local address";
-       }
-       leaf local-address-high {
-         if-feature ipsec-local-address-range;
-         type inet:ip-address;
-         description
-           "High range of local address";
-       }
-       leaf remote-address-low {
-         if-feature ipsec-remote-address-range;
-         type inet:ip-address;
-         description
-           "Low range of remote address";
-       }
-       leaf remote-address-high {
-         if-feature ipsec-remote-address-range;
-         type inet:ip-address;
-         description
-           "High range of remote address";
-       }
-       leaf next-protocol-low {
-         if-feature ipsec-next-protocol-range;
-         type uint16;
-         description
-           "Low range of next protocol";
-       }
-       leaf next-protocol-high {
-         if-feature ipsec-next-protocol-range;
-         type uint16;
-         description
-           "High range of next protocol";
-       }
-       leaf local-port-low {
-         if-feature ipsec-local-port-range;
-         type inet:port-number;
-         description
-           "Low range of local port";
-       }
-       leaf local-port-high {
-         if-feature ipsec-local-port-range;
-         type inet:port-number;
-         description
-           "High range of local port";
-       }
-       leaf remote-port-high {
-         if-feature ipsec-remote-port-range;
-         type inet:port-number;
-         description
-           "Low range of remote port";
-       }
-       leaf remote-port-low {
-         if-feature ipsec-remote-port-range;
-         type inet:port-number;
-         description
-           "High range of remote port";
-       }
-     }
-     grouping ipsec-algorithm-info {
-       description
-         "IPsec algorithm information used by SPD and SAD";
-       leaf ah-auth-algorithm {
-         if-feature ipsec-ah-authentication;
-         type ipsec-authentication-algorithm;
-         description
-           "Authentication algorithm used by AH";
-       }
-       leaf esp-integrity-algorithm {
-         if-feature ipsec-esp-integrity;
-         type ipsec-authentication-algorithm;
-         description
-           "Integrity algorithm used by ESP";
-       }
-       leaf esp-encrypt-algorithm {
-         if-feature ipsec-esp-encrypt;
-         type ipsec-encryption-algorithm;
-         description
-           "Encryption algorithm used by ESP";
-       }
-     }
-     grouping ipsec-stat {
-       leaf inbound-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound Packet count";
-       }
-       leaf outbound-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound Packet count";
-       }
-       leaf inbound-bytes {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound Packet bytes";
-       }
-       leaf outbound-bytes {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound Packet bytes";
-       }
-       leaf inbound-drop-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Inbound dropped packets count";
-       }
-       leaf outbound-drop-packets {
-         if-feature ipsec-stat;
-         type uint64;
-         config false;
-         description "Outbound dropped packets count";
-       }
-       container dropped-packet-detail {
-         if-feature ipsec-stat;
-         description "The detail information of dropped packets";
-         leaf sa-non-exist {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by SA non-exist.";
-         }
-         leaf queue-full {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by full processing
-              queue";
-         }
-         leaf auth-failure {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts caused by authentication
-              failure";
-         }
-         leaf malform {
-           type uint64;
-           config false;
-           description "The dropped packets counts of malform";
-         }
-         leaf replay {
-           type uint64;
-           config false;
-           description "The dropped packets counts of replay";
-         }
-         leaf large-packet {
-           type uint64;
-           config false;
-           description "The dropped packets counts of too large";
-         }
-         leaf invalid-sa {
-           type uint64;
-           config false;
-           description "The dropped packets counts of invalid SA";
-         }
-         leaf policy-deny {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts of denyed by policy";
-         }
-         leaf other-reason {
-           type uint64;
-           config false;
-           description
-             "The dropped packets counts of other reason";
-         }
-       }
-       description "IPsec statistics information";
-     }
-
-
-     container ike-state {
-       if-feature ikev1-state;
-       config "false";
-       uses ike-proposal-state-components;
-       uses ike-policy-state-grouping;
-       description
-         "Contain the operational data for IKE.";
-     }
-     container ikev2-state {
-       if-feature ikev2-state;
-       config "false";
-       uses ikev2-proposal-state-components;
-       uses ike-policy-state-grouping;
-       description
-         "Contain the operational data for IKEv2.";
-     }
-     container ipsec-state {
-       if-feature ipsec-state;
-       config "false";
-       uses ipsec-policy-state-grouping;
-       uses ipsec-proposal-state-grouping;
-       uses ipsec-alarms-state-grouping;
-       uses ipsec-sa-state-grouping;
-       container redundancy {
-         if-feature ipsec-redundancy;
-         description
-           "Configure redundancy for IPSec";
-         leaf inter-chassis {
-           type empty;
-           description
-             "Set redundancy at chassis level";
-         }
-       }
-
-       description
-         "Contain the operational data for IPSec.";
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     container sad {
-       if-feature sad;
-       config false;
-       description
-         "The IPsec SA database";
-       list sad-entries {
-         key "spi security-protocol direction";
-         description
-           "The SA entries information";
-         leaf spi {
-           type ipsec-spi;
-           description
-             "Security parameter index of SA entry.";
-         }
-         leaf security-protocol {
-           type ipsec-protocol;
-           description
-             "Security protocol of IPsec SA.";
-         }
-         leaf direction {
-           type ipsec-traffic-direction;
-           description
-             "It indicates whether the SA is inbound SA or
-              out bound SA.";
-         }
-         leaf sa-type {
-           type enumeration {
-             enum "manual" {
-               description
-                 "Manual IPsec SA";
-             }
-             enum "isakmp" {
-               description
-                 "ISAKMP IPsec SA";
-             }
-           }
-           description
-             "It indicates whether the SA is created by manual
-              or by dynamic protocol.";
-         }
-         leaf sequence-number {
-           type uint64;
-           description
-             "Current sequence number of IPsec packet.";
-         }
-         leaf sequence-number-overflow-flag {
-           type boolean;
-           description
-             "The flag indicating whether overflow of the sequence
-              number counter should prevent transmission of additional
-              packets on the SA, or whether rollover is permitted.";
-         }
-         leaf anti-replay-enable-flag {
-           type boolean;
-           description
-             "It indicates whether anti-replay is enable or disable.";
-         }
-         leaf anti-replay-window-size {
-           type uint64;
-           description
-             "The size of anti-replay window.";
-         }
-         uses ipsec-algorithm-info;
-         container life-time {
-           leaf life-time-in-seconds {
-             type uint32;
-             description
-               "SA life time in seconds";
-           }
-           leaf remain-life-time-in-seconds {
-             type uint32;
-             description
-               "Remain SA life time in seconds";
-           }
-           leaf life-time-in-byte {
-             type uint32;
-             description
-               "SA life time in bytes";
-           }
-           leaf remain-life-time-in-byte {
-             type uint32;
-             description
-               "Remain SA life time in bytes";
-           }
-           description
-             "SA life time information";
-         }
-         leaf protocol-mode {
-           type ipsec-mode;
-           description
-             "It indicates whether tunnel mode or transport mode
-              will be used.";
-         }
-         container tunnel-mode-process-info {
-           when "../protocol-mode = 'tunnel'" {
-             description
-               "External information of SA when SA works in
-                tunnel mode.";
-           }
-           uses ipsec-tunnel-mode-info;
-           description
-             "External information of SA when SA works in
-              tunnel mode.";
-         }
-         leaf-list dscp {
-           type uint8 {
-             range "0..63";
-           }
-           description
-             "When traffic matchs SPD, the DSCP values used to
-              filter traffic";
-         }
-         leaf path-mtu {
-           type uint16;
-           description
-             "Path MTU valie";
-         }
-         leaf nat-traversal-flag {
-           type boolean;
-           description
-             "Whether the SA is used to protect traffic that needs
-              nat traversal";
-         }
-       }
-     }
-     container spd {
-       if-feature spd;
-       config false;
-       description
-         "IPsec security policy database information";
-       list spd-entries {
-         description
-           "IPsec SPD entry information";
-         list name {
-           description
-             "SPD name information.";
-           leaf name-type {
-             type ipsec-spd-name;
-             description
-               "SPD name type.";
-           }
-           leaf name-string {
-             when "../name-type = 'id_rfc_822_addr' or ../name-type =
-                   'id_fqdn'" {
-               description
-                 "when name type is id_rfc_822_addr or id_fqdn, the
-                  name are saved in string";
-             }
-             type string;
-             description
-               "SPD name content";
-           }
-           leaf name-binary {
-             when "../name-type = 'id_der_asn1_dn' or ../name-type =
-                   'id_key'" {
-               description
-                 "when name type is id_der_asn1_dn or id_key, the name
-                  are saved in binary";
-             }
-             type binary;
-             description
-               "SPD name content";
-           }
-         }
-         leaf pfp-flag {
-           type boolean;
-           description
-             "populate from packet flag";
-         }
-         list traffic-selector {
-           min-elements 1;
-           uses traffic-selector;
-           description
-             "Traffic selectors of SAD entry";
-         }
-         leaf operation {
-           type ipsec-spd-operation;
-           description
-             "It indicates how to process the traffic when it matches
-              the security policy.";
-         }
-         container protect-operation {
-           when "../operation = 'protect'" {
-             description
-               "How to protect the traffic when the SPD operation
-                is protect";
-           }
-           leaf spd-ipsec-mode {
-             type ipsec-mode;
-             description
-               "It indicates which mode is chosen when the traffic need
-               be protected by IPsec.";
-           }
-           leaf esn-flag {
-             type boolean;
-             description
-               "It indicates whether ESN is used.";
-           }
-           leaf spd-ipsec-protocol {
-             type ipsec-protocol;
-             description
-               "It indicates which protocol (AH or ESP) is chosen.";
-           }
-           container tunnel-mode-additional {
-             when "../spd-ipsec-mode = 'tunnel'" {
-               description
-                 "Additional informations when choose tunnel mode";
-             }
-             uses ipsec-tunnel-mode-info;
-             description
-               "When use tunnel mode, the additional information of
-                SPD.";
-           }
-           list spd-algorithm {
-             min-elements 1;
-             uses ipsec-algorithm-info;
-             description
-               "Algorithms defined in SPD, ordered by decreasing
-                priority.";
-           }
-           description
-             "How to protect the traffic when the SPD operation is
-              protect";
-         }
-       }
-     }
-
-     container ipsec-global-statistics {
-       if-feature ipsec-global-stats;
-       config false;
-       description "IPsec global statistics";
-       container ipv4 {
-         description "IPsec statistics of IPv4";
-         uses ipsec-stat;
-       }
-       container ipv6 {
-         description "IPsec statistics of IPv6";
-         uses ipsec-stat;
-       }
-       container global {
-         description "IPsec statistics of global";
-         uses ipsec-stat;
-       }
-     }
-
-
-     /*--------------------*/
-     /* RPC                */
-     /*--------------------*/
-     rpc clear-ipsec-group {
-       if-feature clear-ipsec-group;
-       description
-         "RPC for clear ipsec states";
-       input {
-         leaf alarm-hold-down {
-           type uint8;
-           description
-             "IPSec alarm hold-down";
-         }
-         leaf ipsec-policy-name {
-           type leafref {
-             path "/eipsec:ipsec/eipsec:spd/"+
-                  "eipsec:spd-entries/eipsec:name";
-           }
-           description
-             "IPSec Policy name.";
-         }
-       }
-     }
-
-     rpc clear-ike-group {
-       if-feature clear-ike-group;
-       description
-         "RPC for clear IKE states";
-       input {
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev1/eipsec:proposal/"+
-                  "eipsec:name";
-           }
-           description
-             "IPSec IKE Proposal name.";
-         }
-       }
-     }
-
-     rpc clear-ikev2-group {
-       if-feature clear-ikev2-group;
-       description
-         "RPC for clear IKEv2 states";
-       input {
-         leaf proposal {
-           type leafref {
-             path "/eipsec:ikev2/eipsec:proposal/"+
-                  "eipsec:name";
-           }
-           description
-             "IPSec IKEv2 Proposal name.";
-         }
-       }
-     }
-
-     /* draft-wang-ipsecme-ipsec-yang-00 */
-     rpc reset-ipv4 {
-       if-feature reset-ipv4;
-       description "Reset IPsec IPv4 statistics";
-       input {
-         leaf ipv4 {
-           type empty;
-           description "Reset IPsec IPv4 statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-     rpc reset-ipv6 {
-       if-feature reset-ipv6;
-       description "Reset IPsec IPv6 statistics";
-       input {
-         leaf ipv6 {
-           type empty;
-           description "Reset IPsec IPv6 statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-     rpc reset-global {
-       if-feature reset-global;
-       description "Reset IPsec global statistics";
-       input {
-         leaf ipv6 {
-           type empty;
-           description "Reset IPsec global statistics";
-         }
-       }
-       output {
-         leaf status {
-           type string;
-           description "Operation status";
-         }
-       }
-     }
-/*     notification dpd-failure {
-       description "IKE peer DPD detect failure";
-       leaf peer-id {
-         type string;
-         description "Peer ID";
-       }
-     }
-     notification peer-authentication-failure {
-       if-feature peer-authentication-failure;
-       description "Peer authentication fail when negotication";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-     }
-     notification ike-reauth-failure {
-       if-feature ike-reauth-failure;
-       description "IKE peer reauthentication fail";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-     }
-     notification ike-rekey-failure {
-       if-feature ike-rekey-failure;
-       description "IKE SA rekey failure";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-       leaf old-i-spi {
-         type uint64;
-         description "old SPI";
-       }
-       leaf old-r-spi {
-         type uint64;
-         description "old SPI";
-       }
-     }
-     notification ipsec-rekey-failure {
-       if-feature ipsec-rekey-failure;
-       description "IPsec SA rekey failure";
-       leaf peer-id {
-         type string;
-         description "The ID of remote peer";
-       }
-       leaf old-inbound-spi {
-         type ipsec-spi;
-         description "old inbound SPI";
-       }
-       leaf old-outbound-spi {
-         type ipsec-spi;
-         description "old outbound SPI";
-       }
-     } */
-   } /* module ericsson-ipsec */
diff --git a/example/ietf-ipv4-unicast-routing@2014-10-26.yang b/example/ietf-ipv4-unicast-routing@2014-10-26.yang
deleted file mode 100644
index 5076bc60..00000000
--- a/example/ietf-ipv4-unicast-routing@2014-10-26.yang
+++ /dev/null
@@ -1,232 +0,0 @@
-   module ietf-ipv4-unicast-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv4-unicast-routing";
-
-     prefix "v4ur";
-
-     import ietf-routing {
-       prefix "rt";
-       revision-date "2014-10-26";	
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module augments the 'ietf-routing' module with basic
-        configuration and operational state data for IPv4 unicast
-        routing.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Identities */
-
-     identity ipv4-unicast {
-       base rt:ipv4;
-       description
-         "This identity represents the IPv4 unicast address family.";
-     }
-
-     /* Operational state data */
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route" {
-       when "../../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments an IPv4 unicast route.";
-       leaf destination-prefix {
-         type inet:ipv4-prefix;
-         description
-           "IPv4 destination prefix.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../../../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case of IPv4 unicast
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family = 'v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments next-hop list with IPv4 next-hop address.
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-
-     /* Configuration data */
-
-     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
-           + "rt:routing-protocol/rt:static-routes" {
-       description
-         "This augment defines the configuration of the 'static'
-          pseudo-protocol with data specific to IPv4 unicast.";
-       container ipv4 {
-         description
-           "Configuration of a 'static' pseudo-protocol instance
-            consists of a list of routes.";
-         list route {
-           key "destination-prefix";
-           ordered-by "user";
-           description
-             "A user-ordered list of static routes.";
-           leaf destination-prefix {
-             type inet:ipv4-prefix;
-             mandatory "true";
-             description
-               "IPv4 destination prefix.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route.";
-           }
-           container next-hop {
-             description
-               "Configuration of next-hop.";
-             grouping next-hop-content {
-               description
-                 "Next-hop content for IPv4 unicast static routes.";
-               uses rt:next-hop-content {
-                 augment "next-hop-options" {
-                   description
-                     "Add next-hop address case.";
-                   leaf next-hop-address {
-                     type inet:ipv4-address;
-                     description
-                       "IPv4 address of the next-hop.";
-                   }
-                 }
-               }
-             }
-             choice simple-or-list {
-               description
-                 "Options for next-hops.";
-               list multipath-entry {
-                 if-feature rt:multipath-routes;
-                 key "name";
-                 description
-                   "List of alternative next-hops.";
-                 leaf name {
-                   type string;
-                   description
-                     "A unique identifier of the next-hop entry.";
-                 }
-                 uses next-hop-content;
-                 uses rt:next-hop-classifiers;
-               }
-               case simple-next-hop {
-                 uses next-hop-content;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     augment "/rt:fib-route/rt:input/rt:destination-address" {
-       when "rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'rt:destination-address' parameter of
-          the 'rt:fib-route' operation.";
-       leaf address {
-         type inet:ipv4-address;
-         description
-           "IPv4 destination address.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route" {
-       when "rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the reply to the 'rt:fib-route'
-          operation.";
-       leaf destination-prefix {
-         type inet:ipv4-prefix;
-         description
-           "IPv4 destination prefix.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
-           + "rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family='v4ur:ipv4-unicast'" {
-         description
-           "This augment is valid only for IPv4 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case in the reply to
-          the 'rt:fib-route' operation.";
-       leaf next-hop-address {
-         type inet:ipv4-address;
-         description
-           "IPv4 address of the next-hop.";
-       }
-     }
-   }
-
diff --git a/example/ietf-ipv6-unicast-routing@2014-10-26.yang b/example/ietf-ipv6-unicast-routing@2014-10-26.yang
deleted file mode 100644
index c5377da6..00000000
--- a/example/ietf-ipv6-unicast-routing@2014-10-26.yang
+++ /dev/null
@@ -1,636 +0,0 @@
-
-   module ietf-ipv6-unicast-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-ipv6-unicast-routing";
-
-     prefix "v6ur";
-
-     import ietf-routing {
-       prefix "rt";
-       revision-date "2014-10-26";
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-interfaces {
-       prefix "if";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-ip {
-       prefix "ip";
-       revision-date "2014-06-16";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module augments the 'ietf-routing' module with basic
-        configuration and operational state data for IPv6 unicast
-        routing.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Identities */
-
-     identity ipv6-unicast {
-       base rt:ipv6;
-       description
-         "This identity represents the IPv6 unicast address family.";
-     }
-
-     /* Operational state data */
-
-     augment "/rt:routing-state/rt:routing-instance/rt:interfaces/"
-           + "rt:interface" {
-       description
-         "IPv6-specific parameters of router interfaces.";
-       container ipv6-router-advertisements {
-         description
-           "Parameters of IPv6 Router Advertisements.";
-         leaf send-advertisements {
-           type boolean;
-           description
-             "A flag indicating whether or not the router sends periodic
-              Router Advertisements and responds to Router
-              Solicitations.";
-         }
-         leaf max-rtr-adv-interval {
-           type uint16 {
-             range "4..1800";
-           }
-           units "seconds";
-           description
-             "The maximum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-         }
-         leaf min-rtr-adv-interval {
-           type uint16 {
-             range "3..1350";
-           }
-           units "seconds";
-           description
-             "The minimum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-         }
-         leaf managed-flag {
-           type boolean;
-           description
-             "The value that is placed in the 'Managed address
-              configuration' flag field in the Router Advertisement.";
-         }
-         leaf other-config-flag {
-           type boolean;
-           description
-             "The value that is placed in the 'Other configuration' flag
-              field in the Router Advertisement.";
-         }
-         leaf link-mtu {
-           type uint32;
-           description
-             "The value that is placed in MTU options sent by the
-              router. A value of zero indicates that no MTU options are
-              sent.";
-         }
-         leaf reachable-time {
-           type uint32 {
-             range "0..3600000";
-           }
-           units "milliseconds";
-           description
-             "The value that is placed in the Reachable Time field in
-              the Router Advertisement messages sent by the router. A
-              value of zero means unspecified (by this router).";
-         }
-         leaf retrans-timer {
-           type uint32;
-           units "milliseconds";
-           description
-             "The value that is placed in the Retrans Timer field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-         }
-         leaf cur-hop-limit {
-           type uint8;
-           description
-             "The value that is placed in the Cur Hop Limit field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-         }
-         leaf default-lifetime {
-           type uint16 {
-             range "0..9000";
-           }
-           units "seconds";
-           description
-             "The value that is placed in the Router Lifetime field of
-              Router Advertisements sent from the interface, in seconds.
-              A value of zero indicates that the router is not to be
-              used as a default router.";
-         }
-         container prefix-list {
-           description
-             "A list of prefixes that are placed in Prefix Information
-              options in Router Advertisement messages sent from the
-              interface.
-
-              By default, these are all prefixes that the router
-              advertises via routing protocols as being on-link for the
-              interface from which the advertisement is sent.";
-           list prefix {
-             key "prefix-spec";
-             description
-               "Advertised prefix entry and its parameters.";
-             leaf prefix-spec {
-               type inet:ipv6-prefix;
-               description
-                 "IPv6 address prefix.";
-             }
-             leaf valid-lifetime {
-               type uint32;
-               units "seconds";
-               description
-                 "The value that is placed in the Valid Lifetime in the
-                  Prefix Information option. The designated value of all
-                  1's (0xffffffff) represents infinity.";
-             }
-             leaf on-link-flag {
-               type boolean;
-               description
-                 "The value that is placed in the on-link flag ('L-bit')
-                  field in the Prefix Information option.";
-             }
-             leaf preferred-lifetime {
-               type uint32;
-               units "seconds";
-               description
-                 "The value that is placed in the Preferred Lifetime in
-                  the Prefix Information option, in seconds. The
-                  designated value of all 1's (0xffffffff) represents
-                  infinity.";
-             }
-             leaf autonomous-flag {
-               type boolean;
-               description
-                 "The value that is placed in the Autonomous Flag field
-                  in the Prefix Information option.";
-             }
-           }
-         }
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route" {
-       when "../../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments an IPv6 unicast route.";
-       leaf destination-prefix {
-         type inet:ipv6-prefix;
-         description
-           "IPv6 destination prefix.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:ribs/rt:rib/rt:routes/rt:route/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../../../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case of IPv6 unicast
-          routes.";
-       leaf next-hop {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-
-     augment "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-           + "rt:next-hop/rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family = 'v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments next-hop list with IPv6 next-hop address.
-          routes.";
-       leaf next-hop-address {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-
-     /* Configuration data */
-
-     augment
-       "/rt:routing/rt:routing-instance/rt:interfaces/rt:interface" {
-       when "/if:interfaces/if:interface[if:name=current()/rt:name]/"
-          + "ip:ipv6/ip:enabled='true'" {
-         description
-           "This augment is only valid for router interfaces with
-            enabled IPv6.";
-       }
-       description
-         "Configuration of IPv6-specific parameters of router
-          interfaces.";
-       container ipv6-router-advertisements {
-         description
-           "Configuration of IPv6 Router Advertisements.";
-         leaf send-advertisements {
-           type boolean;
-           default "false";
-           description
-             "A flag indicating whether or not the router sends periodic
-              Router Advertisements and responds to Router
-              Solicitations.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvSendAdvertisements.";
-         }
-         leaf max-rtr-adv-interval {
-           type uint16 {
-             range "4..1800";
-           }
-           units "seconds";
-           default "600";
-           description
-             "The maximum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              MaxRtrAdvInterval.";
-         }
-         leaf min-rtr-adv-interval {
-           type uint16 {
-             range "3..1350";
-           }
-           units "seconds";
-           must ". <= 0.75 * ../max-rtr-adv-interval" {
-             description
-               "The value MUST NOT be greater than 75 % of
-                'max-rtr-adv-interval'.";
-           }
-           description
-             "The minimum time allowed between sending unsolicited
-              multicast Router Advertisements from the interface.
-
-              The default value to be used operationally if this leaf is
-              not configured is determined as follows:
-
-              - if max-rtr-adv-interval >= 9 seconds, the default value
-                is 0.33 * max-rtr-adv-interval;
-
-              - otherwise it is 0.75 * max-rtr-adv-interval.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              MinRtrAdvInterval.";
-         }
-         leaf managed-flag {
-           type boolean;
-           default "false";
-           description
-             "The value to be placed in the 'Managed address
-              configuration' flag field in the Router Advertisement.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvManagedFlag.";
-         }
-         leaf other-config-flag {
-           type boolean;
-           default "false";
-           description
-             "The value to be placed in the 'Other configuration' flag
-              field in the Router Advertisement.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvOtherConfigFlag.";
-         }
-         leaf link-mtu {
-           type uint32;
-           default "0";
-           description
-             "The value to be placed in MTU options sent by the router.
-              A value of zero indicates that no MTU options are sent.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvLinkMTU.";
-         }
-         leaf reachable-time {
-           type uint32 {
-             range "0..3600000";
-           }
-           units "milliseconds";
-           default "0";
-           description
-             "The value to be placed in the Reachable Time field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvReachableTime.";
-         }
-         leaf retrans-timer {
-           type uint32;
-           units "milliseconds";
-           default "0";
-           description
-             "The value to be placed in the Retrans Timer field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvRetransTimer.";
-         }
-         leaf cur-hop-limit {
-           type uint8;
-           description
-             "The value to be placed in the Cur Hop Limit field in the
-              Router Advertisement messages sent by the router. A value
-              of zero means unspecified (by this router).
-
-              If this parameter is not configured, the device SHOULD use
-              the value specified in IANA Assigned Numbers that was in
-              effect at the time of implementation.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvCurHopLimit.
-
-              IANA: IP Parameters,
-              http://www.iana.org/assignments/ip-parameters";
-         }
-         leaf default-lifetime {
-           type uint16 {
-             range "0..9000";
-           }
-           units "seconds";
-           description
-             "The value to be placed in the Router Lifetime field of
-              Router Advertisements sent from the interface, in seconds.
-              It MUST be either zero or between max-rtr-adv-interval and
-              9000 seconds. A value of zero indicates that the router is
-              not to be used as a default router. These limits may be
-              overridden by specific documents that describe how IPv6
-              operates over different link layers.
-
-              If this parameter is not configured, the device SHOULD use
-              a value of 3 * max-rtr-adv-interval.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvDefaultLifeTime.";
-         }
-         container prefix-list {
-           description
-             "Configuration of prefixes to be placed in Prefix
-              Information options in Router Advertisement messages sent
-              from the interface.
-
-              Prefixes that are advertised by default but do not have
-              their entries in the child 'prefix' list are advertised
-              with the default values of all parameters.
-
-              The link-local prefix SHOULD NOT be included in the list
-              of advertised prefixes.";
-           reference
-             "RFC 4861: Neighbor Discovery for IP version 6 (IPv6) -
-              AdvPrefixList.";
-           list prefix {
-             key "prefix-spec";
-             description
-               "Configuration of an advertised prefix entry.";
-             leaf prefix-spec {
-               type inet:ipv6-prefix;
-               description
-                 "IPv6 address prefix.";
-             }
-             choice control-adv-prefixes {
-               default "advertise";
-               description
-                 "The prefix either may be explicitly removed from the
-                  set of advertised prefixes, or parameters with which
-                  it is advertised may be specified (default case).";
-               leaf no-advertise {
-                 type empty;
-                 description
-                   "The prefix will not be advertised.
-
-                    This can be used for removing the prefix from the
-                    default set of advertised prefixes.";
-               }
-               case advertise {
-                 leaf valid-lifetime {
-                   type uint32;
-                   units "seconds";
-                   default "2592000";
-                   description
-                     "The value to be placed in the Valid Lifetime in
-                      the Prefix Information option. The designated
-                      value of all 1's (0xffffffff) represents
-                      infinity.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvValidLifetime.";
-                 }
-                 leaf on-link-flag {
-                   type boolean;
-                   default "true";
-                   description
-                     "The value to be placed in the on-link flag
-                      ('L-bit') field in the Prefix Information
-                      option.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvOnLinkFlag.";
-                 }
-                 leaf preferred-lifetime {
-                   type uint32;
-                   units "seconds";
-                   must ". <= ../valid-lifetime" {
-                     description
-                       "This value MUST NOT be greater than
-                        valid-lifetime.";
-                   }
-                   default "604800";
-                   description
-                     "The value to be placed in the Preferred Lifetime
-                      in the Prefix Information option. The designated
-                      value of all 1's (0xffffffff) represents
-                      infinity.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvPreferredLifetime.";
-                 }
-                 leaf autonomous-flag {
-                   type boolean;
-                   default "true";
-                   description
-                     "The value to be placed in the Autonomous Flag
-                      field in the Prefix Information option.";
-                   reference
-                     "RFC 4861: Neighbor Discovery for IP version 6
-                      (IPv6) - AdvAutonomousFlag.";
-                 }
-               }
-             }
-           }
-         }
-       }
-     }
-
-     augment "/rt:routing/rt:routing-instance/rt:routing-protocols/"
-           + "rt:routing-protocol/rt:static-routes" {
-       description
-         "This augment defines the configuration of the 'static'
-          pseudo-protocol with data specific to IPv6 unicast.";
-       container ipv6 {
-         description
-           "Configuration of a 'static' pseudo-protocol instance
-            consists of a list of routes.";
-         list route {
-           key "destination-prefix";
-           ordered-by "user";
-           description
-             "A user-ordered list of static routes.";
-           leaf destination-prefix {
-             type inet:ipv6-prefix;
-             mandatory "true";
-             description
-               "IPv6 destination prefix.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route.";
-           }
-           container next-hop {
-             description
-               "Configuration of next-hop.";
-             grouping next-hop-content {
-               description
-                 "Next-hop content for IPv6 unicast static routes.";
-               uses rt:next-hop-content {
-                 augment "next-hop-options" {
-                   description
-                     "Add next-hop address case.";
-                   leaf next-hop-address {
-                     type inet:ipv6-address;
-                     description
-                       "IPv6 address of the next-hop.";
-                   }
-                 }
-               }
-             }
-             choice simple-or-list {
-               description
-                 "Options for next-hops.";
-               list multipath-entry {
-                 if-feature rt:multipath-routes;
-                 key "name";
-                 description
-                   "List of alternative next-hops.";
-                 leaf name {
-                   type string;
-                   description
-                     "A unique identifier of the next-hop entry.";
-                 }
-                 uses next-hop-content;
-                 uses rt:next-hop-classifiers;
-               }
-               case simple-next-hop {
-                 uses next-hop-content;
-               }
-             }
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     augment "/rt:fib-route/rt:input/rt:destination-address" {
-       when "rt:address-family='v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'rt:destination-address' parameter of
-          the 'rt:fib-route' operation.";
-       leaf address {
-         type inet:ipv6-address;
-         description
-           "IPv6 destination address.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route" {
-       when "rt:address-family='v6ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the reply to the 'rt:fib-route'
-          operation.";
-       leaf destination-prefix {
-         type inet:ipv6-prefix;
-         description
-           "IPv6 destination prefix.";
-       }
-     }
-
-     augment "/rt:fib-route/rt:output/rt:route/rt:next-hop/"
-           + "rt:next-hop-options/rt:simple-next-hop" {
-       when "../rt:address-family='v4ur:ipv6-unicast'" {
-         description
-           "This augment is valid only for IPv6 unicast.";
-       }
-       description
-         "This leaf augments the 'simple-next-hop' case in the reply to
-          the 'rt:fib-route' operation.";
-       leaf next-hop-address {
-         type inet:ipv6-address;
-         description
-           "IPv6 address of the next-hop.";
-       }
-     }
-   }
-
diff --git a/example/ietf-routing@2014-10-26.yang b/example/ietf-routing@2014-10-26.yang
deleted file mode 100644
index 9c870419..00000000
--- a/example/ietf-routing@2014-10-26.yang
+++ /dev/null
@@ -1,1112 +0,0 @@
-   module ietf-routing {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
-
-     prefix "rt";
-
-     import ietf-yang-types {
-       prefix "yang";
-       revision-date "2013-07-15";
-     }
-
-     import ietf-interfaces {
-       prefix "if";
-       revision-date "2014-05-08";
-     }
-
-     import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-     }
-
-     organization
-       "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-       "WG Web:   <http://tools.ietf.org/wg/netmod/>
-        WG List:  <mailto:netmod@ietf.org>
-
-        WG Chair: Thomas Nadeau
-                  <mailto:tnadeau@lucidvision.com>
-
-        WG Chair: Juergen Schoenwaelder
-                  <mailto:j.schoenwaelder@jacobs-university.de>
-
-        Editor:   Ladislav Lhotka
-                  <mailto:lhotka@nic.cz>";
-
-     description
-       "This YANG module defines essential components for the management
-        of a routing subsystem.
-
-        Copyright (c) 2014 IETF Trust and the persons identified as
-        authors of the code. All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject to
-        the license terms contained in, the Simplified BSD License set
-        forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC XXXX; see the
-        RFC itself for full legal notices.";
-
-     revision 2014-10-26 {
-       description
-         "Initial revision.";
-       reference
-         "RFC XXXX: A YANG Data Model for Routing Management";
-     }
-
-     /* Features */
-
-     feature multiple-ribs {
-       description
-         "This feature indicates that the server supports user-defined
-          RIBS and the framework for passing routes between RIBs.
-
-          Servers that do not advertize this feature MUST provide
-          exactly one system-controlled RIB per supported address family
-          and make them also the default RIBs. These RIBs then appear as
-          entries of the list /routing-state/ribs/rib.";
-     }
-
-     feature multipath-routes {
-       description
-
-         "This feature indicates that the server supports multipath
-          routes that have a list of next-hops.";
-     }
-
-     feature router-id {
-       description
-         "This feature indicates that the server supports configuration
-          of an explicit 32-bit router ID that is used by some routing
-          protocols.
-
-          Servers that do not advertize this feature set a router ID
-          algorithmically, usually to one of configured IPv4 addresses.
-          However, this algorithm is implementation-specific.";
-     }
-
-     /* Identities */
-
-     identity address-family {
-       description
-         "Base identity from which identities describing address
-          families are derived.";
-     }
-
-     identity ipv4 {
-       base address-family;
-       description
-         "This identity represents IPv4 address family.";
-     }
-
-     identity ipv6 {
-       base address-family;
-       description
-         "This identity represents IPv6 address family.";
-     }
-
-     identity routing-instance {
-       description
-         "Base identity from which identities describing routing
-          instance types are derived.";
-     }
-
-     identity default-routing-instance {
-       base routing-instance;
-       description
-         "This identity represents either a default routing instance, or
-          the only routing instance on systems that do not support
-          multiple instances.";
-     }
-
-     identity routing-protocol {
-       description
-         "Base identity from which routing protocol identities are
-          derived.";
-     }
-
-     identity direct {
-       base routing-protocol;
-       description
-         "Routing pseudo-protocol which provides routes to directly
-          connected networks.";
-     }
-
-     identity static {
-       base routing-protocol;
-       description
-         "Static routing pseudo-protocol.";
-     }
-
-     identity route-filter {
-       description
-         "Base identity from which all route filters are derived.";
-     }
-
-     identity deny-all-route-filter {
-       base route-filter;
-       description
-         "Route filter that blocks all routes.";
-     }
-
-     identity allow-all-route-filter {
-       base route-filter;
-       description
-         "Route filter that permits all routes.";
-     }
-
-     /* Type Definitions */
-
-     typedef routing-instance-ref {
-       type leafref {
-         path "/rt:routing/rt:routing-instance/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a routing instance
-          configuration.";
-     }
-
-     typedef routing-instance-state-ref {
-
-       type leafref {
-         path "/rt:routing-state/rt:routing-instance/rt:name";
-       }
-       description
-         "This type is used for leafs that reference state data of a
-          routing instance.";
-     }
-
-     typedef rib-ref {
-       type leafref {
-         path "/rt:routing/rt:ribs/rt:rib/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a RIB
-          configuration.";
-     }
-
-     typedef rib-state-ref {
-       type leafref {
-         path "/rt:routing-state/rt:ribs/rt:rib/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a RIB in state
-          data.";
-     }
-
-     typedef next-hop-list-ref {
-       type leafref {
-         path "/rt:routing-state/rt:next-hop-lists/rt:next-hop-list/"
-            + "rt:id";
-       }
-       description
-         "This type is used for leafs that reference a next-hop list (in
-          state data).";
-     }
-
-     typedef route-filter-ref {
-       type leafref {
-         path "/rt:routing/rt:route-filters/rt:route-filter/rt:name";
-       }
-       description
-         "This type is used for leafs that reference a route filter
-          configuration.";
-     }
-
-     typedef route-filter-state-ref {
-       type leafref {
-         path "/rt:routing-state/rt:route-filters/rt:route-filter/"
-            + "rt:name";
-       }
-       description
-         "This type is used for leafs that reference state data of a
-          route filter.";
-     }
-
-     typedef route-preference {
-       type uint32;
-       description
-         "This type is used for route preferences.";
-     }
-
-     /* Groupings */
-
-     grouping address-family {
-       description
-         "This grouping provides a leaf identifying an address
-          family.";
-       leaf address-family {
-         type identityref {
-           base address-family;
-         }
-         mandatory "true";
-         description
-           "Address family.";
-       }
-     }
-
-     grouping state-entry-id {
-       description
-         "This grouping provides a unique identifier for entries in
-          several operational state lists.";
-       leaf id {
-         type uint64;
-         description
-           "Unique numerical identifier of a list entry in operational
-            state. It may be used by protocols or tools that inspect
-            and/or manipulate operational state data and prefer
-            fixed-size integers as list entry handles.
-
-            These identifiers are always ephemeral, i.e., they may
-            change after a reboot.";
-       }
-     }
-
-     grouping router-id {
-       description
-         "This grouping provides router ID.";
-       leaf router-id {
-         type yang:dotted-quad;
-         description
-           "A 32-bit number in the form of a dotted quad that is used by
-            some routing protocols identifying a router.";
-         reference
-           "RFC 2328: OSPF Version 2.";
-       }
-     }
-
-     grouping next-hop-classifiers {
-       description
-         "This grouping provides two next-hop classifiers.";
-       leaf priority {
-         type enumeration {
-           enum primary {
-             value "1";
-             description
-               "Primary next-hop.";
-           }
-           enum backup {
-             value "2";
-             description
-               "Backup next-hop.";
-           }
-         }
-         description
-           "Simple priority for distinguishing between primary and
-            backup next-hops.
-
-            Backup next-hops are used if and only if no primary
-            next-hops are reachable.";
-       }
-       leaf weight {
-         type uint8;
-         must ". = 0 or not(../../next-hop/weight = 0)" {
-           error-message "Illegal combination of zero and non-zero "
-                       + "next-hop weights.";
-           description
-             "Next-hop weights must be either all zero (equal
-              load-balancing) or all non-zero.";
-         }
-         description
-           "This parameter specifies the weight of the next-hop for load
-            balancing. The number specifies the relative fraction of the
-            traffic that will use the corresponding next-hop.
-
-            A value of 0 represents equal load-balancing.
-
-            If both primary and backup next-hops are present, then the
-            weights for each priority level are used separately.";
-       }
-     }
-
-     grouping special-next-hop {
-       description
-         "This grouping provides a leaf with enumeration of special
-          next-hops.";
-       leaf special-next-hop {
-         type enumeration {
-           enum blackhole {
-             description
-               "Silently discard the packet.";
-           }
-           enum unreachable {
-             description
-               "Discard the packet and notify the sender with an error
-                message indicating that the destination host is
-                unreachable.";
-           }
-           enum prohibit {
-             description
-               "Discard the packet and notify the sender with an error
-                message indicating that the communication is
-                administratively prohibited.";
-           }
-           enum receive {
-             description
-               "The packet will be received by the local system.";
-           }
-         }
-         description
-           "Special next-hop options.";
-       }
-     }
-
-     grouping next-hop-content {
-       description
-         "Generic parameters of next-hops in static routes.";
-       choice next-hop-options {
-         mandatory "true";
-         description
-           "Options for next-hops in static routes.";
-         case simple-next-hop {
-           description
-
-             "Simple next-hop is specified as an outgoing interface,
-              next-hop address or both.
-
-              Address-family-specific modules are expected to provide
-              'next-hop-address' leaf via augmentation.";
-           leaf outgoing-interface {
-             type leafref {
-               path "/rt:routing/rt:routing-instance/rt:interfaces/"
-                  + "rt:interface/rt:name";
-             }
-             description
-               "Name of the outgoing interface.";
-           }
-         }
-         case special-next-hop {
-           uses special-next-hop;
-         }
-       }
-     }
-
-     grouping next-hop-state-content {
-       description
-         "Generic parameters of next-hops in state data.";
-       choice next-hop-options {
-         mandatory "true";
-         description
-           "Options for next-hops in state data.";
-         leaf next-hop-list {
-           type next-hop-list-ref;
-           description
-             "Reference to a next-hop list.";
-         }
-         leaf use-rib {
-           type rib-state-ref;
-           description
-             "Reference to a RIB in which a new look-up is to be
-              performed.";
-         }
-         case simple-next-hop {
-           description
-             "Simple next-hop is specified as an outgoing interface,
-              next-hop address or both.
-
-              Address-family-specific modules are expected to provide
-              'next-hop-address' leaf via augmentation.";
-           leaf outgoing-interface {
-             type leafref {
-               path "/rt:routing-state/rt:routing-instance/"
-                  + "rt:interfaces/rt:interface/rt:name";
-             }
-             description
-               "Name of the outgoing interface.";
-           }
-         }
-         case special-next-hop {
-           uses special-next-hop;
-         }
-       }
-     }
-
-     grouping route-metadata {
-       description
-         "Route metadata.";
-       leaf source-protocol {
-         type identityref {
-           base routing-protocol;
-         }
-         mandatory "true";
-         description
-           "Type of the routing protocol from which the route
-            originated.";
-       }
-       leaf active {
-         type empty;
-         description
-           "Presence of this leaf indicates that the route is preferred
-            among all routes in the same RIB that have the same
-            destination prefix.";
-       }
-       leaf last-updated {
-         type yang:date-and-time;
-         description
-           "Time stamp of the last modification of the route. If the
-            route was never modified, it is the time when the route was
-            inserted into the RIB.";
-       }
-     }
-
-     /* Operational state data */
-
-     container routing-state {
-       config "false";
-       description
-         "Operational state of the routing subsystem.";
-       list routing-instance {
-         key "name";
-         unique "id";
-         min-elements "1";
-         description
-           "Each list entry is a container for operational state data of
-            a routing instance.
-
-            An implementation MAY create one or more system-controlled
-            instances, other user-controlled instances MAY be created by
-            configuration.";
-         leaf name {
-           type string;
-           description
-             "The name of the routing instance.
-
-              For system-controlled instances the name is persistent,
-              i.e., it SHOULD NOT change across reboots.";
-         }
-         uses state-entry-id {
-           refine "id" {
-             mandatory "true";
-           }
-         }
-         leaf type {
-           type identityref {
-             base routing-instance;
-           }
-           description
-             "The routing instance type.";
-         }
-         container default-ribs {
-           description
-             "Default RIBs used by the routing instance.";
-           list default-rib {
-             key "address-family";
-             description
-               "Each list entry specifies the default RIB for one
-                address family.
-
-                The default RIB is operationally connected to all
-                routing protocols for which a connected RIB has not been
-                explicitly configured.
-
-                The 'direct' pseudo-protocol is always connected to the
-                default RIBs.";
-             uses address-family;
-             leaf rib-name {
-               type rib-state-ref;
-               mandatory "true";
-               description
-                 "Name of an existing RIB to be used as the default RIB
-                  for the given routing instance and address family.";
-             }
-           }
-         }
-         container interfaces {
-           description
-             "Network layer interfaces belonging to the routing
-              instance.";
-           list interface {
-             key "name";
-             description
-               "List of network layer interfaces assigned to the routing
-                instance.";
-             leaf name {
-               type if:interface-state-ref;
-               description
-                 "A reference to the name of a configured network layer
-                  interface.";
-             }
-           }
-         }
-         container routing-protocols {
-           description
-             "Container for the list of routing protocol instances.";
-           list routing-protocol {
-             key "type name";
-             description
-               "Operational state of a routing protocol instance.
-
-                An implementation MUST provide exactly one
-                system-controlled instance of the type 'direct'. Other
-                instances MAY be created by configuration.";
-             leaf type {
-               type identityref {
-                 base routing-protocol;
-               }
-               description
-                 "Type of the routing protocol.";
-             }
-             leaf name {
-               type string;
-               description
-                 "The name of the routing protocol instance.
-
-                  For system-controlled instances this name is
-                  persistent, i.e., it SHOULD NOT change across
-                  reboots.";
-             }
-             leaf route-preference {
-               type route-preference;
-               mandatory "true";
-               description
-                 "The value of route preference (administrative
-                  distance) assigned to all routes generated by the
-                  routing protocol instance. A lower value means a more
-                  preferred route.";
-             }
-             container connected-ribs {
-               description
-                 "Container for connected RIBs.";
-               list connected-rib {
-                 key "rib-name";
-                 description
-                   "List of RIBs to which the routing protocol instance
-                    is connected.
-
-                    By default, routes learned by the routing protocol
-                    instance are installed in all connected RIBs of the
-                    matching address family, and, conversely, all routes
-                    from connected RIBs are installed in the routing
-                    protocol instance. However, routing protocols may
-                    specify other rules.";
-                 leaf rib-name {
-                   type rib-state-ref;
-                   description
-                     "Name of an existing RIB.";
-                 }
-                 leaf import-filter {
-                   type route-filter-state-ref;
-                   description
-                     "Reference to a route filter that is used for
-                      filtering routes passed from this routing protocol
-                      instance to the RIB specified by the 'rib-name'
-                      sibling node.
-
-                      If this leaf is not present, the behavior is
-                      protocol-specific, but typically it means that all
-                      routes are accepted.";
-                 }
-                 leaf export-filter {
-                   type route-filter-state-ref;
-                   description
-                     "Reference to a route filter that is used for
-                      filtering routes passed from the RIB specified by
-                      the 'rib-name' sibling node to this routing
-                      protocol instance.
-
-                      If this leaf is not present, the behavior is
-                      protocol-specific - typically it means that all
-                      routes are accepted.
-
-                      The 'direct' and 'static' pseudo-protocols accept
-                      no routes from any RIB.";
-                 }
-               }
-             }
-           }
-         }
-       }
-       container next-hop-lists {
-         description
-           "Container for next-hop lists.";
-         list next-hop-list {
-           key "id";
-           description
-             "Next-hop list.";
-           uses state-entry-id;
-           uses address-family;
-           list next-hop {
-             description
-               "Entry in a next-hop list.";
-             uses next-hop-state-content;
-             uses next-hop-classifiers;
-           }
-         }
-       }
-       container ribs {
-         description
-           "Container for RIBs.";
-         list rib {
-           key "name";
-           unique "id";
-           description
-             "Each entry represents a RIB identified by the 'name' key.
-              All routes in a RIB MUST belong to the same address
-              family.
-
-              The server MUST provide a system-controlled default RIB
-              for each address family, and MAY provide other
-              system-controlled RIBs. Additional RIBs MAY be created in
-              the configuration.";
-           leaf name {
-             type string;
-             description
-               "The name of the RIB.";
-           }
-           uses state-entry-id {
-             refine "id" {
-               mandatory "true";
-             }
-           }
-           uses address-family;
-           container routes {
-             description
-               "Current content of the RIB.";
-             list route {
-               description
-                 "A RIB route entry. This data node MUST be augmented
-                  with information specific for routes of each address
-                  family.";
-               leaf route-preference {
-                 type route-preference;
-                 description
-                   "This route attribute, also known as administrative
-                    distance, allows for selecting the preferred route
-                    among routes with the same destination prefix. A
-                    smaller value means a more preferred route.";
-               }
-               container next-hop {
-                 description
-                   "Route's next-hop attribute.";
-                 uses next-hop-state-content;
-               }
-               uses route-metadata;
-             }
-           }
-           container recipient-ribs {
-             description
-               "Container for recipient RIBs.";
-             list recipient-rib {
-               key "rib-name";
-               description
-                 "List of RIBs that receive routes from this RIB.";
-               leaf rib-name {
-                 type rib-state-ref;
-                 description
-                   "The name of the recipient RIB.";
-               }
-               leaf filter {
-                 type route-filter-state-ref;
-                 description
-                   "A route filter which is applied to the routes passed
-                    to the recipient RIB.";
-               }
-             }
-           }
-         }
-       }
-       container route-filters {
-         description
-           "Container for route filters.";
-         list route-filter {
-           key "name";
-           description
-             "Route filters are used for filtering and/or manipulating
-              routes that are passed between a routing protocol and a
-              RIB and vice versa, or between two RIBs.
-
-              It is expected that other modules augment this list with
-              contents specific for a particular route filter type.";
-           leaf name {
-             type string;
-             description
-               "The name of the route filter.";
-           }
-           leaf type {
-             type identityref {
-               base route-filter;
-             }
-             mandatory "true";
-             description
-               "Type of the route-filter - an identity derived from the
-                'route-filter' base identity.";
-           }
-         }
-       }
-     }
-
-     /* Configuration Data */
-     container routing {
-       description
-         "Configuration parameters for the routing subsystem.";
-       list routing-instance {
-         key "name";
-         description
-           "Configuration of a routing instance.";
-         leaf name {
-           type string;
-           description
-             "The name of the routing instance.
-
-              For system-controlled entries, the value of this leaf must
-              be the same as the name of the corresponding entry in
-              state data.
-
-              For user-controlled entries, an arbitrary name can be
-              used.";
-         }
-         leaf type {
-           type identityref {
-             base routing-instance;
-           }
-           default "rt:default-routing-instance";
-           description
-             "The type of the routing instance.";
-         }
-         leaf enabled {
-           type boolean;
-           default "true";
-           description
-             "Enable/disable the routing instance.
-
-              If this parameter is false, the parent routing instance is
-              disabled and does not appear in operational state data,
-              despite any other configuration that might be present.";
-         }
-         uses router-id {
-           if-feature router-id;
-           description
-             "Configuration of the global router ID. Routing protocols
-              that use router ID can use this parameter or override it
-              with another value.";
-         }
-         leaf description {
-           type string;
-           description
-             "Textual description of the routing instance.";
-         }
-         container default-ribs {
-           if-feature multiple-ribs;
-           description
-             "Configuration of the default RIBs used by the routing
-              instance.
-
-              The default RIB for an addressed family if by default
-              connected to all routing protocol instances supporting
-              that address family, and always receives direct routes.";
-           list default-rib {
-             must "address-family=/routing/ribs/rib[name=current()/"
-                + "rib-name]/address-family" {
-               error-message "Address family mismatch.";
-               description
-                 "The entry's address family MUST match that of the
-                  referenced RIB.";
-             }
-             key "address-family";
-             description
-               "Each list entry configures the default RIB for one
-                address family.";
-             uses address-family;
-             leaf rib-name {
-               type string;
-               mandatory "true";
-               description
-                 "Name of an existing RIB to be used as the default RIB
-                  for the given routing instance and address family.";
-             }
-           }
-         }
-         container interfaces {
-           description
-             "Configuration of the routing instance's interfaces.";
-           list interface {
-             key "name";
-             description
-               "List of network layer interfaces assigned to the routing
-                instance.";
-             leaf name {
-               type if:interface-ref;
-               description
-                 "A reference to the name of a configured network layer
-                  interface.";
-             }
-           }
-         }
-         container routing-protocols {
-           description
-             "Configuration of routing protocol instances.";
-           list routing-protocol {
-             key "type name";
-             description
-               "Each entry contains configuration of a routing protocol
-                instance.";
-             leaf type {
-               type identityref {
-                 base routing-protocol;
-               }
-               description
-                 "Type of the routing protocol - an identity derived
-                  from the 'routing-protocol' base identity.";
-             }
-             leaf name {
-               type string;
-               description
-                 "An arbitrary name of the routing protocol instance.";
-             }
-             leaf description {
-               type string;
-               description
-                 "Textual description of the routing protocol
-                  instance.";
-             }
-             leaf enabled {
-               type boolean;
-               default "true";
-               description
-                 "Enable/disable the routing protocol instance.
-
-                  If this parameter is false, the parent routing
-                  protocol instance is disabled and does not appear in
-                  operational state data, despite any other
-                  configuration that might be present.";
-             }
-             leaf route-preference {
-               type route-preference;
-               description
-                 "The value of route preference (administrative
-                  distance).
-
-                  The default value depends on the routing protocol
-                  type, and may also be implementation-dependent.";
-             }
-             container connected-ribs {
-               description
-                 "Configuration of connected RIBs.";
-               list connected-rib {
-                 key "rib-name";
-                 description
-                   "Each entry configures a RIB to which the routing
-                    protocol instance is connected.
-                    If no connected RIB is configured for an address
-                    family, the routing protocol is connected to the
-                    default RIB for that address family.";
-                 leaf rib-name {
-                   type rib-ref;
-                   must "../../../type != 'rt:direct' or "
-                      + "../../../../../default-ribs/ "
-                      + "default-rib/rib-name=." {
-                     error-message "The 'direct' protocol can be "
-                                 + "connected only to a default RIB.";
-                     description
-                       "For the 'direct' pseudo-protocol, the connected
-                        RIB must always be a default RIB.";
-                   }
-                   description
-                     "Name of an existing RIB.";
-                 }
-                 leaf import-filter {
-                   type route-filter-ref;
-                   description
-                     "Configuration of import filter.";
-                 }
-                 leaf export-filter {
-                   type route-filter-ref;
-                   description
-                     "Configuration of export filter.";
-                 }
-               }
-             }
-             container static-routes {
-               when "../type='rt:static'" {
-                 description
-                   "This container is only valid for the 'static'
-                    routing protocol.";
-               }
-               description
-                 "Configuration of the 'static' pseudo-protocol.
-
-                  Address-family-specific modules augment this node with
-                  their lists of routes.";
-             }
-           }
-         }
-       }
-       container ribs {
-         description
-           "Configuration of RIBs.";
-         list rib {
-           key "name";
-           description
-             "Each entry represents a configured RIB identified by the
-              'name' key.
-
-              Entries having the same key as a system-controlled entry
-              of the list /routing-state/ribs/rib are used for
-              configuring parameters of that entry. Other entries define
-              additional user-controlled RIBs.";
-           leaf name {
-             type string;
-             description
-               "The name of the RIB.
-
-                For system-controlled entries, the value of this leaf
-                must be the same as the name of the corresponding entry
-                in state data.
-
-                For user-controlled entries, an arbitrary name can be
-                used.";
-           }
-           uses address-family;
-           leaf description {
-             type string;
-             description
-               "Textual description of the RIB.";
-           }
-           container recipient-ribs {
-             if-feature multiple-ribs;
-             description
-               "Configuration of recipient RIBs.";
-             list recipient-rib {
-               must "rib-name != ../../name" {
-                 error-message
-                   "Source and recipient RIBs are identical.";
-                 description
-                   "A RIB MUST NOT appear among its recipient RIBs.";
-               }
-               must "/routing/ribs/rib[name=current()/rib-name]/"
-                  + "address-family=../../address-family" {
-                 error-message "Address family mismatch.";
-                 description
-                   "Address family of the recipient RIB MUST match that
-                    of the source RIB.";
-               }
-               key "rib-name";
-               description
-                 "Each entry configures a recipient RIB.";
-               leaf rib-name {
-                 type rib-ref;
-                 description
-                   "The name of the recipient RIB.";
-               }
-               leaf filter {
-                 type route-filter-ref;
-                 description
-                   "A route filter which is applied to the routes passed
-                    to the recipient RIB.";
-               }
-             }
-           }
-         }
-       }
-       container route-filters {
-         description
-           "Configuration of route filters.";
-         list route-filter {
-           key "name";
-           description
-             "Each entry configures a named route filter.";
-           leaf name {
-             type string;
-             description
-               "The name of the route filter.";
-           }
-           leaf description {
-             type string;
-             description
-               "Textual description of the route filter.";
-           }
-           leaf type {
-             type identityref {
-               base route-filter;
-             }
-             mandatory "true";
-             description
-               "Type of the route filter..";
-           }
-         }
-       }
-     }
-
-     /* RPC methods */
-
-     rpc fib-route {
-       description
-         "Return the active FIB route that a routing-instance uses for
-          sending packets to a destination address.";
-       input {
-         leaf routing-instance-name {
-           type routing-instance-state-ref;
-           mandatory "true";
-           description
-             "Name of the routing instance whose forwarding information
-              base is being queried.
-
-              If the routing instance with name equal to the value of
-              this parameter doesn't exist, then this operation SHALL
-              fail with error-tag 'data-missing' and error-app-tag
-              'routing-instance-not-found'.";
-         }
-         container destination-address {
-           description
-             "Network layer destination address.
-
-              Address family specific modules MUST augment this
-              container with a leaf named 'address'.";
-           uses address-family;
-         }
-       }
-       output {
-         container route {
-           description
-             "The active route for the specified destination.
-
-              If the routing instance has no active route for the
-              destination address, no output is returned - the server
-              SHALL send an <rpc-reply> containing a single element
-              <ok>.
-
-              Address family specific modules MUST augment this list
-              with appropriate route contents.";
-           uses address-family;
-           container next-hop {
-             description
-               "Route's next-hop attribute.";
-             uses next-hop-state-content;
-           }
-           uses route-metadata;
-         }
-       }
-     }
-
-     rpc route-count {
-       description
-         "Return the current number of routes in a RIB.";
-       input {
-         leaf rib-name {
-           type rib-state-ref;
-           mandatory "true";
-           description
-             "Name of the RIB.
-
-              If the RIB with name equal to the value of this parameter
-              doesn't exist, then this operation SHALL fail with
-              error-tag 'data-missing' and error-app-tag
-              'rib-not-found'.";
-         }
-       }
-       output {
-         leaf number-of-routes {
-           type uint64;
-           mandatory "true";
-           description
-             "Number of routes in the RIB.";
-         }
-       }
-     }
-   }
-
diff --git a/lib/src/clixon_xml_map.c b/lib/src/clixon_xml_map.c
index 3a62a5f7..62608af5 100644
--- a/lib/src/clixon_xml_map.c
+++ b/lib/src/clixon_xml_map.c
@@ -1695,11 +1695,10 @@ xml_spec_populate_rpc(clicon_handle h,
 		      yang_spec    *yspec)
 {
     int        retval = -1;
-    yang_stmt *y=NULL;    /* yang node */
+    yang_stmt *yrpc = NULL;    /* yang node */
     yang_stmt *ymod=NULL; /* yang module */
     yang_stmt *yi = NULL; /* input */
     cxobj     *x;
-    //    int        i;
     
     if ((strcmp(xml_name(xrpc), "rpc"))!=0){
 	clicon_err(OE_UNIX, EINVAL, "RPC expected");
@@ -1710,18 +1709,18 @@ xml_spec_populate_rpc(clicon_handle h,
 	if (ys_module_by_xml(yspec, x, &ymod) < 0)
 	    goto done;
 	if (ymod != NULL)
-	    y = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
+	    yrpc = yang_find((yang_node*)ymod, Y_RPC, xml_name(x));
 	/* Non-strict semantics: loop through all modules to find the node 
 	 */
-	if (y == NULL &&
+	if (yrpc == NULL &&
 	    !clicon_option_bool(h, "CLICON_XML_NS_STRICT")){
-	    if (xml_yang_find_non_strict(x, yspec, &y) < 0) /* find rpc */
+	    if (xml_yang_find_non_strict(x, yspec, &yrpc) < 0) /* find rpc */
 		goto done;
 	}
-	if (y){
-	    xml_spec_set(x, y);
-	    if ((yi = yang_find((yang_node*)y, Y_INPUT, NULL)) != NULL){
-		/* kludge rpc -> input */
+	if (yrpc){
+	    xml_spec_set(x, yrpc);
+	    if ((yi = yang_find((yang_node*)yrpc, Y_INPUT, NULL)) != NULL){
+		/* kludge rpc -> input XXX THIS HIDES AN ERROR IN xml_spec_populate */
 		xml_spec_set(x, yi); 
 		if (xml_apply(x, CX_ELMNT, xml_spec_populate, yspec) < 0)
 		    goto done;
@@ -1751,16 +1750,16 @@ xml_spec_populate(cxobj  *x,
 {
     int        retval = -1;
     //    clicon_handle h = (clicon_handle)arg;
-    yang_spec *yspec=NULL; /* yang spec */
-    yang_stmt *y=NULL;  /* yang node */
-    yang_stmt *yparent; /* yang parent */
-    yang_stmt *ymod;    /* yang module */
-    cxobj     *xp;      /* xml parent */
+    yang_spec *yspec = NULL; /* yang spec */
+    yang_stmt *y = NULL;     /* yang node */
+    yang_stmt *yparent;      /* yang parent */
+    yang_stmt *ymod;         /* yang module */
+    cxobj     *xp = NULL;    /* xml parent */
     char      *name;
 
     yspec = (yang_spec*)arg;
     if (xml_spec(x))
-	goto ok;
+	;	//	goto ok;
     xp = xml_parent(x);
     name = xml_name(x);
     if (xp && (yparent = xml_spec(xp)) != NULL)
@@ -1785,7 +1784,7 @@ xml_spec_populate(cxobj  *x,
 	goto done;
     }
 #endif
-    ok:
+    //    ok:
     retval = 0;
  done:
     return retval;
diff --git a/lib/src/clixon_xpath.c b/lib/src/clixon_xpath.c
index b814ffc4..72b727b1 100644
--- a/lib/src/clixon_xpath.c
+++ b/lib/src/clixon_xpath.c
@@ -450,7 +450,6 @@ xp_eval_predicate(xp_ctx     *xc,
 	}
     retval = 0;
  done:
-    assert(retval==0);
     if (xr0)
 	ctx_free(xr0);
     if (xr1)
@@ -716,9 +715,17 @@ xp_relop(xp_ctx    *xc1,
 		s1 = xml_body(x);
 		switch(op){
 		case XO_EQ:
+		    if (s1==NULL || s2==NULL){
+			clicon_err(OE_XML, EINVAL, "Malformed xpath: empty string");
+			goto done;
+		    }
 		    xr->xc_bool = (strcmp(s1, s2)==0);
 		    break;
 		case XO_NE:
+		    if (s1==NULL || s2==NULL){
+			clicon_err(OE_XML, EINVAL, "Malformed xpath: empty string");
+			goto done;
+		    }
 		    xr->xc_bool = (strcmp(s1, s2));
 		    break;
 		default:
diff --git a/lib/src/clixon_yang.c b/lib/src/clixon_yang.c
index dc55bfee..ea4852dd 100644
--- a/lib/src/clixon_yang.c
+++ b/lib/src/clixon_yang.c
@@ -1641,7 +1641,7 @@ yang_augment_node(yang_stmt *ys,
     int        i;
     
     schema_nodeid = ys->ys_argument;
-    clicon_debug(1, "%s %s", __FUNCTION__, schema_nodeid);
+    clicon_debug(2, "%s %s", __FUNCTION__, schema_nodeid);
     /* Find the target */
     if (yang_abs_schema_nodeid(ysp, ys, schema_nodeid, -1, &yss) < 0)
 	goto done;
diff --git a/test/lib.sh b/test/lib.sh
index ce980ffa..c18e76fc 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -25,6 +25,9 @@ testname=
 # Parse yang openconfig models from https://github.com/openconfig/public
 : ${OPENCONFIG=$(pwd)/public}
 
+# Standard IETF RFC yang files. 
+: ${IETFRFC=$YANGMODELS/standard/ietf/RFC}
+
 # For memcheck
 #clixon_cli="valgrind --leak-check=full --show-leak-kinds=all clixon_cli"
 clixon_cli=clixon_cli
diff --git a/test/test_choice.sh b/test/test_choice.sh
index 1289a0f5..373bf835 100755
--- a/test/test_choice.sh
+++ b/test/test_choice.sh
@@ -17,8 +17,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>system</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_cli.sh b/test/test_cli.sh
index 23fee546..b9ff9fc7 100755
--- a/test/test_cli.sh
+++ b/test/test_cli.sh
@@ -18,9 +18,9 @@ cfg=$dir/conf_yang.xml
 cat <<EOF > $cfg
 <config xmlns="urn:example:clixon">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -115,13 +115,7 @@ expectfn "$clixon_cli -1 -f $cfg -l o debug level 1" 0 "^$"
 expectfn "$clixon_cli -1 -f $cfg -l o debug level 0" 0 "^$"
 
 new "cli rpc"
-expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 'rpc-reply {
-    route {
-        address-family ipv4;
-        next-hop {
-            next-hop-list 2.3.4.5;
-        }
-        source-protocol static;'
+expectfn "$clixon_cli -1 -f $cfg -l o rpc ipv4" 0 '<rpc-reply><x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y></rpc-reply>'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_compat.sh b/test/test_compat.sh
index 77875410..10579b6d 100755
--- a/test/test_compat.sh
+++ b/test/test_compat.sh
@@ -8,12 +8,14 @@ APPNAME=example
 . ./lib.sh
 cfg=$dir/conf_startup.xml
 
+# Use yang in example
+
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/$APPNAME/netconf</CLICON_NETCONF_DIR>
diff --git a/test/test_feature.sh b/test/test_feature.sh
index 20adfa3f..3dd1e3d4 100755
--- a/test/test_feature.sh
+++ b/test/test_feature.sh
@@ -7,13 +7,14 @@ APPNAME=example
 cfg=$dir/conf_yang.xml
 fyang=$dir/test.yang
 
+# Note ietf-routing@2018-03-13 assumed
 cat <<EOF > $cfg
 <config>
   <CLICON_FEATURE>$APPNAME:A</CLICON_FEATURE>
   <CLICON_FEATURE>ietf-routing:router-id</CLICON_FEATURE>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -81,10 +82,10 @@ new "cli disabled feature"
 expectfn "$clixon_cli -1f $cfg -l o -y $fyang set y foo" 255 "CLI syntax error: \"set y foo\": Unknown command"
 
 new "cli enabled feature in other module"
-expectfn "$clixon_cli -1f $cfg -y $fyang set routing routing-instance A router-id 1.2.3.4" 0 ""
+expectfn "$clixon_cli -1f $cfg -y $fyang set routing router-id 1.2.3.4" 0 ""
 
 new "cli disabled feature in other module"
-expectfn "$clixon_cli -1f $cfg -l o -y $fyang set routing routing-instance A default-ribs" 255 "CLI syntax error: \"set routing routing-instance A default-ribs\": Unknown command"
+expectfn "$clixon_cli -1f $cfg -l o -y $fyang set routing ribs rib default-rib false" 255 "CLI syntax error: \"set routing ribs rib default-rib\": Unknown command"
 
 new "netconf discard-changes"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
@@ -136,7 +137,7 @@ if [ -z "$match" ]; then
 fi
 
 new "netconf module ietf-interfaces"
-expect="<module><name>ietf-interfaces</name><revision>2014-05-08</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-interfaces</namespace><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-interfaces</name><revision>2018-02-20</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-interfaces</namespace><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
@@ -151,7 +152,7 @@ if [ -z "$match" ]; then
 fi
 
 new "netconf module ietf-routing"
-expect="<module><name>ietf-routing</name><revision>2014-10-26</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-routing</namespace><feature>router-id</feature><conformance-type>implement</conformance-type></module>"
+expect="<module><name>ietf-routing</name><revision>2018-03-13</revision><namespace>urn:ietf:params:xml:ns:yang:ietf-routing</namespace><feature>router-id</feature><conformance-type>implement</conformance-type></module>"
 match=`echo "$ret" | grep -GZo "$expect"`
 if [ -z "$match" ]; then
       err "$expect" "$ret"
diff --git a/test/test_identity.sh b/test/test_identity.sh
index eeaa6198..862074ac 100755
--- a/test/test_identity.sh
+++ b/test/test_identity.sh
@@ -12,6 +12,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
diff --git a/test/test_leafref.sh b/test/test_leafref.sh
index 4bb83b5c..66692d54 100755
--- a/test/test_leafref.sh
+++ b/test/test_leafref.sh
@@ -9,9 +9,10 @@ fyang=$dir/leafref.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -72,73 +73,73 @@ module example{
 }
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend  -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend  -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "leafref base config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type><ipv4><address><ip>192.0.2.1</ip><prefix-length>24</prefix-length></address><address><ip>192.0.2.2</ip><prefix-length>24</prefix-length></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip><prefix-length>32</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name><type>ex:eth</type><ipv4><address><ip>192.0.2.1</ip><prefix-length>24</prefix-length></address><address><ip>192.0.2.2</ip><prefix-length>24</prefix-length></address></ipv4></interface><interface><name>lo</name><type>ex:lo</type><ipv4><address><ip>127.0.0.1</ip><prefix-length>32</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref get config"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref base commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref get config"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth0</name>'
 
 new "leafref add wrong ref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth3</absname><address>10.0.4.6</address></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref validate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth3</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "leafref add correct absref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><absname>eth0</absname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "leafref add correct relref"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><default-address xmlns="urn:example:clixon"><relname>eth0</relname></default-address></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # XXX add address
 
 new "leafref validate (ok)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>"
 
 new "leafref delete leaf"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>'
 
 new "leafref validate (should fail)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>"  '^<rpc-reply><rpc-error><error-type>application</error-type><error-tag>bad-element</error-tag><error-info><bad-element>eth0</bad-element></error-info><error-severity>error</error-severity><error-message>Leafref validation failed: No such leaf</error-message></rpc-error></rpc-reply>]]>]]>$'
 
 new "leafref discard-changes"
 expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "cli leafref lo"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set default-address absname lo" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set default-address absname lo" 0 "^$"
 
 new "cli leafref validate"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o validate" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o validate" 0 "^$"
 
 new "cli sender"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender a" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set sender a" 0 "^$"
 
 new "cli sender template"
-expectfn "$clixon_cli -1f $cfg -y $fyang -l o set sender b template a" 0 "^$"
+expectfn "$clixon_cli -1f $cfg -l o set sender b template a" 0 "^$"
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_list.sh b/test/test_list.sh
index 1b9bdc2e..b0e37eb6 100755
--- a/test/test_list.sh
+++ b/test/test_list.sh
@@ -11,9 +11,9 @@ fyang=$dir/test.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MAIN_FILE>$fyang</CLICON_YANG_MAIN_FILE>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -64,65 +64,65 @@ module $APPNAME{
 }
 EOF
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 
 if [ $BE -ne 0 ]; then
     new "kill old backend"
-    sudo clixon_backend -zf $cfg -y $fyang
+    sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend -s init -f $cfg -y $fyang"
+    new "start backend -s init -f $cfg"
     # start new backend
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "minmax: minimal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: minimal validate ok"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: maximal"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a0><k>0</k></a0><a0><k>1</k></a0><a0><k>unbounded</k></a0><a1><k>0</k></a1><a1><k>1</k></a1><b0>0</b0><b0>1</b0><b0>unbounded</b0><b1>0</b1><b0>1</b0></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate ok"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "minmax: empty"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"/></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 # NYI
 if false; then 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: no leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><a1><k>1</k></a1><a1><k>2</k></a1><b1>0</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 
 new "minmax: Too large leaf-list"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>replace</default-operation><config><c xmlns="urn:example:clixon"><a1><k>0</k></a1><b1>0</b1><b1>1</b1><b1>2</b1></c></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "minmax: validate should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error/></rpc-reply>]]>]]>$"
 fi # NYI
 
 if [ $BE -eq 0 ]; then
diff --git a/test/test_nacm.sh b/test/test_nacm.sh
index aac4be87..3eaf7a56 100755
--- a/test/test_nacm.sh
+++ b/test/test_nacm.sh
@@ -17,6 +17,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh
index edbef77f..373b18de 100755
--- a/test/test_nacm_ext.sh
+++ b/test/test_nacm_ext.sh
@@ -20,6 +20,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/example/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
@@ -40,13 +41,11 @@ EOF
 cat <<EOF > $fyang
 module $APPNAME{
   yang-version 1.1;
-  namespace "urn:example:clixon";
-
-  prefix ex;
-  import ietf-routing {
-        description "For fib-route";
-	prefix rt;
+  namespace "urn:example:my";
+  import clixon-example {
+	prefix ex;
   }
+  prefix my;
   container authentication {
 	description "Example code for enabling www basic auth and some example 
                      users";
@@ -72,13 +71,6 @@ module $APPNAME{
     type int32;
     description "something to edit";
   }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
 }
 EOF
 
@@ -163,7 +155,7 @@ new "restconf DELETE whole datastore"
 expecteq "$(curl -u andy:bar -sS -X DELETE http://localhost/restconf/data)" ""
 
 new2 "auth get"
-expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -u andy:bar -sS -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new "Set x to 0"
@@ -209,7 +201,7 @@ new "cli show conf as guest"
 expectfn "$clixon_cli -1 -U guest -l o -f $cfg -y $fyang show conf" 255 "protocol access-denied"
 
 new "cli rpc as admin"
-expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 "next-hop-list 2.3.4.5;"
+expectfn "$clixon_cli -1 -U andy -l o -f $cfg -y $fyang rpc ipv4" 0 '<x xmlns="urn:example:clixon">ipv4</x><y xmlns="urn:example:clixon">42</y>'
 
 new "cli rpc as limited"
 expectfn "$clixon_cli -1 -U wilma -l o -f $cfg -y $fyang rpc ipv4" 255 "protocol access-denied default deny"
diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh
index 8a3c298e..fb579f21 100755
--- a/test/test_nacm_protocol.sh
+++ b/test/test_nacm_protocol.sh
@@ -37,6 +37,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_RESTCONF_DIR>/usr/local/lib/$APPNAME/restconf</CLICON_RESTCONF_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
diff --git a/test/test_netconf.sh b/test/test_netconf.sh
index ced3047d..60ce0214 100755
--- a/test/test_netconf.sh
+++ b/test/test_netconf.sh
@@ -5,15 +5,17 @@ APPNAME=example
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
-fyang=$dir/netconf.yang
 tmp=$dir/tmp.x
 
+# Use yang in example
+
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_MODULE_SET_ID>42</CLICON_MODULE_SET_ID>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
@@ -29,65 +31,7 @@ cat <<EOF > $cfg
 </config>
 EOF
 
-cat <<EOF > $fyang
-module example{
-    yang-version 1.1;
-    namespace "urn:example:clixon";
-    prefix ex;
-    import ietf-interfaces {
-	prefix if;
-    }
-    import ietf-ip {
-      prefix ip;
-    }
-    import ietf-routing {
-      prefix rt;
-    }
-    import ietf-inet-types {
-       prefix "inet";
-       revision-date "2013-07-15";
-    }
-    rpc empty {
-    }
-    list server {
-       key name;
-       leaf name {
-         type string;
-       }
-       action reset {
-       }
-    }
-    identity eth {
-	 base if:interface-type;
-    }
-
-    rpc client-rpc {
-	description "Example local client-side RPC that is processed by the
-                     the netconf/restconf and not sent to the backend.
-                     This is a clixon implementation detail: some rpc:s
-                     are better processed by the client for API or perf reasons";
-	input {
-	    leaf request {
-		type string;
-	    }
-	}
-	output {
-	    leaf result{
-		type string;
-	    }
-	}
-    }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
-}
-EOF
-
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 # Bring your own backend
 if [ $BE -ne 0 ]; then
     # kill old backend (if any)
@@ -96,31 +40,31 @@ if [ $BE -ne 0 ]; then
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend  -s init -f $cfg -y $fyang"
+    new "start backend  -s init -f $cfg"
     # start new backend
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
 fi
 
 new "netconf hello"
-expecteof "$clixon_netconf -f $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.0</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&amp;module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -f $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><capabilities><capability>urn:ietf:params:netconf:base:1.0</capability><capability>urn:ietf:params:netconf:capability:yang-library:1.0?revision=2016-06-21&amp;module-set-id=42</capability><capability>urn:ietf:params:netconf:capability:candidate:1:0</capability><capability>urn:ietf:params:netconf:capability:validate:1.1</capability><capability>urn:ietf:params:netconf:capability:startup:1.0</capability><capability>urn:ietf:params:netconf:capability:xpath:1.0</capability><capability>urn:ietf:params:netconf:capability:notification:1.0</capability></capabilities><session-id>[0-9]*</session-id></hello>]]>]]><rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "netconf get-config double quotes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
 
 new "netconf get-config single quotes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc message-id='101' xmlns='urn:ietf:params:xml:ns:netconf:base:1.0'><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc message-id='101' xmlns='urn:ietf:params:xml:ns:netconf:base:1.0'><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none which should not change anything"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><default-operation>none</default-operation><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "Check nothing added"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Add subtree eth/0/0 using none and create which should add eth/0/0"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes, (single inside double inside single) need to fool bash
 cat <<EOF > $tmp # new
@@ -128,22 +72,22 @@ cat <<EOF > $tmp # new
 EOF
 
 new "Check eth/0/0 added using xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "Re-create same eth/0/0 which should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="create"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>' '^<rpc-reply><rpc-error>'
 
 new "Delete eth/0/0 using none config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "Check deleted eth/0/0 (non-presence container)"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc message-id="101"><get-config><source><candidate/></source></get-config></rpc>]]>]]>' '^<rpc-reply message-id="101"><data/></rpc-reply>]]>]]>$'
 
 new "Re-Delete eth/0/0 using none should generate error"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><rpc-error>'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface operation="delete"><name>eth/0/0</name><type>ex:eth</type></interface></interfaces></config><default-operation>none</default-operation> </edit-config></rpc>]]>]]>'  '^<rpc-reply><rpc-error>'
 
 new "netconf edit config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -151,7 +95,7 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 # Too many quotes
 cat <<EOF > $tmp # new
@@ -159,99 +103,96 @@ cat <<EOF > $tmp # new
 EOF
 
 new "netconf get config xpath parent"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "$(cat $tmp)" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><enabled>true</enabled></interface><interface><name>eth1</name><enabled>true</enabled><ipv4><enabled>true</enabled><forwarding>false</forwarding><address><ip>9.2.3.4</ip><prefix-length>24</prefix-length></address></ipv4></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf validate missing type"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><rpc-error>"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get empty config2"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
 new "netconf edit extra xml"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><extra/></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><extra/></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error>"
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config eth1"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf validate"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><validate><source><candidate/></source></validate></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf commit"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><commit/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit config merge"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth2</name><type>ex:eth</type></interface></interfaces></config><default-operation>merge</default-operation></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit ampersand encoding(<&): name:'eth&' type:'t<>'"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type></interface></interfaces></config></edit-config></rpc>]]>]]>' '^<rpc-reply><ok/></rpc-reply>]]>]]>$'
 
 new "netconf get replaced config"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><candidate/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth&amp;</name><type>t&lt;&gt;</type><enabled>true</enabled></interface><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface><interface><name>eth2</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "cli show configuration eth& - encoding tests"
-expectfn "$clixon_cli -1 -f $cfg -y $fyang show conf cli" 0 "interfaces interface eth& type t<>
+expectfn "$clixon_cli -1 -f $cfg show conf cli" 0 "interfaces interface eth& type t<>
 interfaces interface eth& enabled true"
 
 new "netconf edit CDATA"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><type>ex:eth</type><description><![CDATA[myeth&]]></description></interface></interfaces></config></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 #new "netconf get CDATA"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>' '<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>'
+#expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><get-config><source><candidate/></source><filter type=\"xpath\" select=\"/interfaces/interface[name='eth/0/0']/description\" /></get-config></rpc>]]>]]>' '<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth/0/0</name><description><![CDATA[myeth&]]></description><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>'
 
 new "netconf discard-changes"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><discard-changes/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf edit state operation should fail"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><config><state xmlns="urn:example:clixon"><op>42</op></state></config></edit-config></rpc>]]>]]>' "^<rpc-reply><rpc-error><error-type>protocol</error-type><error-tag>invalid-value</error-tag>"
 
 new "netconf get state operation"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get><filter type=\"xpath\" select=\"/state\"/></get></rpc>]]>]]>" '^<rpc-reply><data><state xmlns="urn:example:clixon"><op>42</op></state></data></rpc-reply>]]>]]>$'
 
 new "netconf lock/unlock"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]><rpc><unlock><target><candidate/></target></unlock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]><rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf lock/lock"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf lock" 
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><lock><target><candidate/></target></lock></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "close-session"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><close-session/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><close-session/></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # XXX NOTE that this does not actually kill a running session - and may even kill some random process,...
 new "kill-session"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><kill-session><session-id>44</session-id></kill-session></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "copy startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><copy-config><target><startup/></target><source><candidate/></source></copy-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><copy-config><target><startup/></target><source><candidate/></source></copy-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf get startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" '^<rpc-reply><data><interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"><interface><name>eth1</name><type>ex:eth</type><enabled>true</enabled></interface></interfaces></data></rpc-reply>]]>]]>$'
 
 new "netconf delete startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><delete-config><target><startup/></target></delete-config></rpc>]]>]]>" "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf check empty startup"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 "<rpc><get-config><source><startup/></source></get-config></rpc>]]>]]>" "^<rpc-reply><data/></rpc-reply>]]>]]>$"
 
-new "netconf rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>' '^<rpc-reply><route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><address-family>ipv4</address-family><next-hop><next-hop-list>'
-
-#new "netconf rpc without namespace (iterate kludge should work)"
-#expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><fib-route><routing-instance-name>ipv4</routing-instance-name><destination-address><address-family>ipv4</address-family></destination-address></fib-route></rpc>]]>]]>" "^<rpc-reply><route><address-family>ipv4</address-family><next-hop><next-hop-list>"
+new "netconf example rpc"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><example xmlns="urn:example:clixon"><x>42</x></example></rpc>]]>]]>' '^<rpc-reply><x xmlns="urn:example:clixon">42</x><y xmlns="urn:example:clixon">42</y></rpc-reply>]]>]]>$'
 
 new "netconf empty rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 new "netconf client-side rpc"
-expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
+expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><client-rpc xmlns="urn:example:clixon"><request>example</request></client-rpc></rpc>]]>]]>' '^<rpc-reply><result xmlns="urn:example:clixon">ok</result></rpc-reply>]]>]]>$'
 
 if [ $BE -eq 0 ]; then
     exit # BE
diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh
index b9a4f680..b5e03e83 100755
--- a/test/test_openconfig.sh
+++ b/test/test_openconfig.sh
@@ -9,6 +9,7 @@
 APPNAME=example
 
 # include err() and new() functions and creates $dir
+. ./site.sh
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
@@ -61,9 +62,8 @@ cat <<EOF > $cfg
   <CLICON_YANG_DIR>$OCDIR/wifi/mac</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/wifi/phy</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>$OCDIR/wifi/types</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_order.sh b/test/test_order.sh
index 4db73e9c..8f96c726 100755
--- a/test/test_order.sh
+++ b/test/test_order.sh
@@ -24,9 +24,8 @@ fi
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>/tmp/conf_yang.xml</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -140,7 +139,7 @@ new "get each ordered-by user leaf-list"
 expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 "<rpc><get-config><source><running/></source><filter type=\"xpath\" select=\"/y3[k='b']\"/></get-config></rpc>]]>]]>" '^<rpc-reply><data><y3 xmlns="urn:example:clixon"><k>b</k><a>bar</a></y3></data></rpc-reply>]]>]]>$'
 
 new "delete candidate"
-expecteof "$clixon_netconf -qf $cfg" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
+expecteof "$clixon_netconf -qf $cfg -y $fyang" 0 '<rpc><edit-config><target><candidate/></target><default-operation>none</default-operation><config operation="delete"/></edit-config></rpc>]]>]]>' "^<rpc-reply><ok/></rpc-reply>]]>]]>$"
 
 # LEAF_LISTS
 
diff --git a/test/test_perf.sh b/test/test_perf.sh
index eb1fe687..1d4c0cbf 100755
--- a/test/test_perf.sh
+++ b/test/test_perf.sh
@@ -49,6 +49,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>scaling</CLICON_YANG_MODULE_MAIN>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
diff --git a/test/test_restconf.sh b/test/test_restconf.sh
index 66710e91..d0aabca5 100755
--- a/test/test_restconf.sh
+++ b/test/test_restconf.sh
@@ -5,14 +5,15 @@ APPNAME=example
 # include err() and new() functions and creates $dir
 . ./lib.sh
 cfg=$dir/conf.xml
-fyang=$dir/restconf.yang
+
+# Use yang in example
 
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_BACKEND_REGEXP>example_backend.so$</CLICON_BACKEND_REGEXP>
@@ -30,63 +31,38 @@ cat <<EOF > $cfg
 EOF
 
 cat <<EOF > $fyang
-module example{
+module mymod{
     yang-version 1.1;
-    namespace "urn:example:clixon";
-    prefix ex;
+    namespace "urn:example:my";
+    prefix me;
+    import clixon-example {
+	prefix ex;
+    }
     import ietf-interfaces {
 	prefix if;
     }
     import ietf-ip {
       prefix ip;
     }
-    import ietf-routing {
-      prefix rt;
-    }
     import ietf-inet-types {
        prefix "inet";
        revision-date "2013-07-15";
     }
-    identity eth {
-	base if:interface-type;
-    }
-    rpc empty {
-    }
-    rpc client-rpc {
-       	description "Example local client-side rpc";
-	input {
-	    leaf request {
-		type string;
-	    }
-	}
-	output {
-	    leaf result{
-		type string;
-	    }
-	}
-    }
-    container state {
-       config false;
-       description "state data for example application";
-       leaf-list op {
-          type string;
-       }
-    }
 }
 EOF
 
 # This is a fixed 'state' implemented in routing_backend. It is assumed to be always there
-state='{"example:state": {"op": "42"}}'
+state='{"clixon-example:state": {"op": "42"}}'
 
-new "test params: -f $cfg -y $fyang"
+new "test params: -f $cfg"
 if [ $BE -ne 0 ]; then
     new "kill old backend"
     sudo clixon_backend -zf $cfg
     if [ $? -ne 0 ]; then
 	err
     fi
-    new "start backend -s init -f $cfg -y $fyang"
-    sudo $clixon_backend -s init -f $cfg -y $fyang -D $DBG
+    new "start backend -s init -f $cfg"
+    sudo $clixon_backend -s init -f $cfg -D $DBG
     if [ $? -ne 0 ]; then
 	err
     fi
@@ -96,7 +72,7 @@ new "kill old restconf daemon"
 sudo pkill -u www-data clixon_restconf
 
 new "start restconf daemon"
-sudo su -c "$clixon_restconf -f $cfg -y $fyang -D $DBG" -s /bin/sh www-data &
+sudo su -c "$clixon_restconf -f $cfg -D $DBG" -s /bin/sh www-data &
 
 sleep $RCWAIT
 
@@ -118,12 +94,12 @@ expecteq "$(curl -s -H 'Accept: application/yang-data+xml' -G http://localhost/r
 
 # Should be alphabetically ordered
 new2 "restconf get restconf/operations. RFC8040 3.3.2 (json)"
-expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"example:empty": null,"example:client-rpc": null,"ietf-routing:fib-route": null,"ietf-routing:route-count": null,"clixon-lib:debug": null}
+expecteq "$(curl -sG http://localhost/restconf/operations)" '{"operations": {"clixon-example:client-rpc": null,"clixon-example:empty": null,"clixon-example:example": null,"clixon-lib:debug": null}
 
'
 
 new "restconf get restconf/operations. RFC8040 3.3.2 (xml)"
 ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/operations)
-expect='<operations><empty xmlns="urn:example:clixon"/><client-rpc xmlns="urn:example:clixon"/><fib-route xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><route-count xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"/><debug xmlns="http://clicon.org/lib"/></operations>'
+expect='<operations><client-rpc xmlns="urn:example:clixon"/><empty xmlns="urn:example:clixon"/><example xmlns="urn:example:clixon"/><debug xmlns="http://clicon.org/lib"/></operations>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
@@ -141,7 +117,7 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf schema resource, RFC 8040 sec 3.7 according to RFC 7895 (explicit resource)"
-expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-routing,2014-10-26/)" '{"ietf-yang-library:module": [{"name": "ietf-routing","revision": "2014-10-26","namespace": "urn:ietf:params:xml:ns:yang:ietf-routing","conformance-type": "implement"}]}
+expecteq "$(curl -s -H 'Accept: application/yang-data+json' -G http://localhost/restconf/data/ietf-yang-library:modules-state/module=ietf-interfaces,2018-02-20)" '{"ietf-yang-library:module": [{"name": "ietf-interfaces","revision": "2018-02-20","namespace": "urn:ietf:params:xml:ns:yang:ietf-interfaces","conformance-type": "implement"}]}
 
'
 
 new "restconf options. RFC 8040 4.1"
@@ -152,24 +128,24 @@ expectfn "curl -s -I http://localhost/restconf/data" 0 "HTTP/1.1 200 OK"
 #Content-Type: application/yang-data+json"
 
 new "restconf empty rpc"
-expecteq "$(curl -s -X POST -d {\"example:input\":null} http://localhost/restconf/operations/example:empty)" ""
+expecteq "$(curl -s -X POST -d {\"clixon-example:input\":null} http://localhost/restconf/operations/clixon-example:empty)" ""
 
 new2 "restconf empty rpc with extra args (should fail)"
-expecteq "$(curl -s -X POST -d {\"example:input\":{\"extra\":null}} http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d {\"clixon-example:input\":{\"extra\":null}} http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf get empty config + state json"
-expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json + module"
-expecteq "$(curl -sSG http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -sSG http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf get empty config + state json with wrong module name"
 expecteq "$(curl -sSG http://localhost/restconf/data/badmodule:state)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "No such yang module: badmodule"}}}
'
 
 new "restconf get empty config + state xml"
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state)
 expect='<state xmlns="urn:example:clixon"><op>42</op></state>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -177,12 +153,12 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf get data/ json"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
 new "restconf get state operation eth0 xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state/op=42)
 expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -190,12 +166,12 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf get state operation eth0 type json"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state/op=42)" '{"example:op": "42"}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state/op=42)" '{"clixon-example:op": "42"}
 
'
 
 new "restconf get state operation eth0 type xml"
 # Cant get shell macros to work, inline matching from lib.sh
-ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/example:state/op=42)
+ret=$(curl -s -H "Accept: application/yang-data+xml" -G http://localhost/restconf/data/clixon-example:state/op=42)
 expect='<op xmlns="urn:example:clixon">42</op>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -203,7 +179,7 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf GET datastore"
-expecteq "$(curl -s -X GET http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -s -X GET http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 # Exact match
@@ -223,7 +199,7 @@ new "restconf delete interfaces"
 expecteq $(curl -s -X DELETE  http://localhost/restconf/data/ietf-interfaces:interfaces) ""
 
 new "restconf Check empty config"
-expectfn "curl -sG http://localhost/restconf/data/example:state" 0 "$state"
+expectfn "curl -sG http://localhost/restconf/data/clixon-example:state" 0 "$state"
 
 # XXX: gives  <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 #      <interface xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
@@ -237,7 +213,7 @@ expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces
 
'
 
 new2 "restconf Check eth/0/0 added state"
-expecteq "$(curl -s -G http://localhost/restconf/data/example:state)" '{"example:state": {"op": "42"}}
+expecteq "$(curl -s -G http://localhost/restconf/data/clixon-example:state)" '{"clixon-example:state": {"op": "42"}}
 
'
 
 new2 "restconf Re-post eth/0/0 which should generate error"
@@ -270,52 +246,42 @@ expecteq "$(curl -s -G http://localhost/restconf/data/ietf-interfaces:interfaces
 
'
 
 new2 "restconf rpc using POST json"
-expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv6"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-routing:output": {"route": {"address-family": "ipv4","next-hop": {"next-hop-list": "2.3.4.5"},"source-protocol": "static"}}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "42","y": "42"}}
 
'
 
-# Cant get this to work due to quoting
-#new2 "restconf rpc using POST wrong JSON"
-#expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"routing-instance-name":ipv4}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": " on line 1: syntax error at or before: i"}}}
'
-
-new2 "restconf rpc using POST json without mandatory element"
-expecteq "$(curl -s -X POST -d '{"ietf-routing:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"wrongelement":"ipv4"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "wrongelement"},"error-severity": "error"}}}
'
 
 new2 "restconf rpc non-existing rpc without namespace"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc non-existing rpc"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:kalle)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "kalle"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf rpc missing name"
 expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "Operation name expected"}}}
'
 
 new2 "restconf rpc missing input"
-expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/ietf-routing:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
+expecteq "$(curl -s -X POST -d '{}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "rpc","error-tag": "malformed-message","error-severity": "error","error-message": "restconf RPC does not have input statement"}}}
'
 
 new "restconf rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"ietf-routing:input":{"routing-instance-name":"ipv4","destination-address":{"address-family":"ipv4"}}}' http://localhost/restconf/operations/ietf-routing:fib-route)
-expect='<output xmlns="urn:ietf:params:xml:ns:yang:ietf-routing"><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop><source-protocol>static</source-protocol></route></output>'
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"x":42}}' http://localhost/restconf/operations/clixon-example:example)
+expect='<output xmlns="urn:example:clixon"><x>42</x><y>42</y></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
 new2 "restconf rpc using wrong prefix"
-expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:fib-route)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"wrong:input":{"routing-instance-name":"ipv4"}}' http://localhost/restconf/operations/wrong:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 new "restconf local client rpc using POST xml"
-ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"example:input":{"request":"example"}}' http://localhost/restconf/operations/example:client-rpc)
+ret=$(curl -s -X POST -H "Accept: application/yang-data+xml" -d '{"clixon-example:input":{"request":"example"}}' http://localhost/restconf/operations/clixon-example:client-rpc)
 expect='<output xmlns="urn:example:clixon"><result>ok</result></output>'
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
     err "$expect" "$ret"
 fi
 
-# XXX cant get -H to work
-#expecteq 'curl -s -X POST -H "Accept: application/yang-data+xml" -d {"ietf-routing:input":{"routing-instance-name":"ipv4"}} http://localhost/restconf/operations/ietf-routing:fib-route' '<output><route><address-family>ipv4</address-family><next-hop><next-hop-list>2.3.4.5</next-hop-list></next-hop></route></output>'
-
-# Cant get shell macros to work, inline matching from lib.sh
-
 new "Kill restconf daemon"
 sudo pkill -u www-data -f "/www-data/clixon_restconf"
 
diff --git a/test/test_restconf2.sh b/test/test_restconf2.sh
index 68677250..8010563f 100755
--- a/test/test_restconf2.sh
+++ b/test/test_restconf2.sh
@@ -13,6 +13,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/var</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>$dir/restconf.pidfile</CLICON_BACKEND_PIDFILE>
diff --git a/test/test_rpc.sh b/test/test_rpc.sh
index 27fb74c8..464a0fc5 100755
--- a/test/test_rpc.sh
+++ b/test/test_rpc.sh
@@ -12,9 +12,9 @@ cfg=$dir/conf.xml
 cat <<EOF > $cfg
 <config xmlns="urn:example:clixon">
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
@@ -55,7 +55,7 @@ new "rpc tests"
 # 1.First some positive tests vary media types
 # extra complex because pattern matching on return haders
 new "restconf empty rpc"
-ret=$(curl -is -X POST http://localhost/restconf/operations/example:empty)
+ret=$(curl -is -X POST http://localhost/restconf/operations/clixon-example:empty)
 expect="204 No Content"
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -66,28 +66,28 @@ new "netconf empty rpc"
 expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><empty xmlns="urn:example:clixon"/></rpc>]]>]]>' '^<rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"><ok/></rpc-reply>]]>]]>$'
 
 new2 "restconf example rpc json/json default - no http media headers"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/json change y default"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "99"}}
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","y":"99"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "99"}}
 
'
 
 new2 "restconf example rpc json/json"
 # XXX example:input example:output
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Content-Type: application/yang-data+json' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc xml/json"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)"  '{"example:output": {"x": "0","y": "42"}}
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Content-Type: application/yang-data+json' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)"  '{"clixon-example:output": {"x": "0","y": "42"}}
 
'
 
 new2 "restconf example rpc json/xml"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+json' -H 'Accept: application/yang-data+xml' -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new2 "restconf example rpc xml/xml"
-expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
+expecteq "$(curl -s -X POST -H 'Content-Type: application/yang-data+xml' -H 'Accept: application/yang-data+xml' -d '<input xmlns="urn:example:clixon"><x>0</x></input>' http://localhost/restconf/operations/clixon-example:example)" '<output xmlns="urn:example:clixon"><x>0</x><y>42</y></output>
 
'
 
 new "netconf example rpc"
@@ -96,7 +96,7 @@ expecteof "$clixon_netconf -qf $cfg" 0 '<rpc xmlns="urn:ietf:params:xml:ns:netco
 # 2. Then error cases
 #
 new "restconf empy rpc with null input"
-ret=$(curl -is -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:empty)
+ret=$(curl -is -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:empty)
 expect="204 No Content"
 match=`echo $ret | grep -EZo "$expect"`
 if [ -z "$match" ]; then
@@ -104,19 +104,19 @@ if [ -z "$match" ]; then
 fi
 
 new2 "restconf empy rpc with input x"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":0}}' http://localhost/restconf/operations/example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":0}}' http://localhost/restconf/operations/clixon-example:empty)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "x"},"error-severity": "error"}}}
'
 
 new2 "restconf omit mandatory"
-expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "x"},"error-severity": "error","error-message": "Mandatory variable"}}}
'
 
 new2 "restconf add extra"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0","extra":"0"}}' http://localhost/restconf/operations/clixon-example:example)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "unknown-element","error-info": {"bad-element": "extra"},"error-severity": "error"}}}
'
 
 new2 "restconf wrong method"
-expecteq "$(curl -s -X POST -d '{"example:input":{"x":"0"}}' http://localhost/restconf/operations/example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":{"x":"0"}}' http://localhost/restconf/operations/clixon-example:wrong)" '{"ietf-restconf:errors" : {"error": {"error-type": "application","error-tag": "missing-element","error-info": {"bad-element": "wrong"},"error-severity": "error","error-message": "RPC not defined"}}}
'
 
 new2 "restconf example missing input"
-expecteq "$(curl -s -X POST -d '{"example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
+expecteq "$(curl -s -X POST -d '{"clixon-example:input":null}' http://localhost/restconf/operations/ietf-netconf:edit-config)" '{"ietf-restconf:errors" : {"error": {"error-type": "protocol","error-tag": "operation-failed","error-severity": "error","error-message": "yang module not found"}}}
'
 
 
 new "netconf kill-session missing session-id mandatory"
diff --git a/test/test_startup.sh b/test/test_startup.sh
index ab0acb0f..fb9b0102 100755
--- a/test/test_startup.sh
+++ b/test/test_startup.sh
@@ -13,9 +13,9 @@ cfg=$dir/conf_startup.xml
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
+  <CLICON_YANG_MODULE_MAIN>clixon-example</CLICON_YANG_MODULE_MAIN>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
   <CLICON_NETCONF_DIR>/usr/local/lib/$APPNAME/netconf</CLICON_NETCONF_DIR>
diff --git a/test/test_stream.sh b/test/test_stream.sh
index 75c7e613..3f166fc5 100755
--- a/test/test_stream.sh
+++ b/test/test_stream.sh
@@ -39,6 +39,7 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_RESTCONF_PRETTY>false</CLICON_RESTCONF_PRETTY>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_DIR>/usr/local/lib/$APPNAME/backend</CLICON_BACKEND_DIR>
diff --git a/test/test_type.sh b/test/test_type.sh
index 188107a6..3ac7e157 100755
--- a/test/test_type.sh
+++ b/test/test_type.sh
@@ -16,9 +16,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_union.sh b/test/test_union.sh
index c583593a..b11e95e6 100755
--- a/test/test_union.sh
+++ b/test/test_union.sh
@@ -14,9 +14,8 @@ cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_when_must.sh b/test/test_when_must.sh
index 82fc5647..9c963d43 100755
--- a/test/test_when_must.sh
+++ b/test/test_when_must.sh
@@ -12,9 +12,8 @@ fyang=$dir/test.yang
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_yang.sh b/test/test_yang.sh
index 46eb6234..e6131381 100755
--- a/test/test_yang.sh
+++ b/test/test_yang.sh
@@ -9,13 +9,12 @@ fyang=$dir/$APPNAME.yang
 fsubmod=$dir/example-types.yang
 fyangerr=$dir/err.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
-  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
-  <CLICON_YANG_MODULE_MAIN>$APPNAME</CLICON_YANG_MODULE_MAIN>
+  <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh
index 4f168fca..a54bac5e 100755
--- a/test/test_yang_load.sh
+++ b/test/test_yang_load.sh
@@ -13,11 +13,9 @@ fyang1=$dir/$APPNAME@2018-12-02.yang
 fyang2=$dir/$APPNAME@2018-01-01.yang
 fyang3=$dir/other.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
-
 # 1st variant of the example module
 cat <<EOF > $fyang1
-module $APPNAME{
+module example{
   prefix ex;
   revision 2018-12-02;
   namespace "urn:example:clixon";
@@ -29,7 +27,7 @@ EOF
 
 # 2nd variant of the same example module
 cat <<EOF > $fyang2
-module $APPNAME{
+module example{
   prefix ex;
   revision 2018-01-01;
   namespace "urn:example:clixon";
@@ -58,6 +56,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang1</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -117,6 +116,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -165,6 +165,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -209,6 +210,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
@@ -254,6 +256,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
   <CLICON_BACKEND_PIDFILE>/usr/local/var/$APPNAME/$APPNAME.pidfile</CLICON_BACKEND_PIDFILE>
@@ -298,6 +301,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_SOCK>/usr/local/var/$APPNAME/$APPNAME.sock</CLICON_SOCK>
@@ -344,6 +348,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-01-01</CLICON_YANG_MODULE_REVISION>
@@ -390,6 +395,7 @@ cat <<EOF > $cfg
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_DIR>$dir</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_YANG_MAIN_FILE>$fyang2</CLICON_YANG_MAIN_FILE>
   <CLICON_YANG_MODULE_MAIN>example</CLICON_YANG_MODULE_MAIN>
   <CLICON_YANG_MODULE_REVISION>2018-12-02</CLICON_YANG_MODULE_REVISION>
diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh
index 43fb2893..f674b61b 100755
--- a/test/test_yang_namespace.sh
+++ b/test/test_yang_namespace.sh
@@ -12,13 +12,12 @@ cfg=$dir/conf_yang.xml
 fyang1=$dir/example1.yang
 fyang2=$dir/example2.yang
 
-#  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
 cat <<EOF > $cfg
 <config>
   <CLICON_CONFIGFILE>$cfg</CLICON_CONFIGFILE>
   <CLICON_YANG_MAIN_DIR>$dir</CLICON_YANG_MAIN_DIR>
-  <CLICON_YANG_DIR>/usr/local/share/$APPNAME/yang</CLICON_YANG_DIR>
   <CLICON_YANG_DIR>/usr/local/share/clixon</CLICON_YANG_DIR>
+  <CLICON_YANG_DIR>$IETFRFC</CLICON_YANG_DIR>
   <CLICON_CLISPEC_DIR>/usr/local/lib/$APPNAME/clispec</CLICON_CLISPEC_DIR>
   <CLICON_CLI_DIR>/usr/local/lib/$APPNAME/cli</CLICON_CLI_DIR>
   <CLICON_CLI_MODE>$APPNAME</CLICON_CLI_MODE>
@@ -39,10 +38,6 @@ module example1{
    yang-version 1.1;
    prefix ex1;
    namespace "urn:example:clixon1";
-   import ietf-routing {
-        description "defines fib-route";
-	prefix rt;
-   }
    leaf x{
      type int32;
    }
diff --git a/test/test_yang_parse.sh b/test/test_yang_parse.sh
deleted file mode 100755
index 3790645f..00000000
--- a/test/test_yang_parse.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-# Test: YANG parser tests
-#PROG="valgrind --leak-check=full --show-leak-kinds=all ../util/clixon_util_yang"
-PROG=../util/clixon_util_yang
-
-# include err() and new() functions and creates $dir
-. ./lib.sh
-
-rm -rf $dir
-
-
diff --git a/test/test_yangmodels.sh b/test/test_yangmodels.sh
index 92cc45a0..02c30ba8 100755
--- a/test/test_yangmodels.sh
+++ b/test/test_yangmodels.sh
@@ -20,6 +20,7 @@
 APPNAME=example
 
 # include err() and new() functions and creates $dir
+. ./site.sh
 . ./lib.sh
 
 cfg=$dir/conf_yang.xml
@@ -52,7 +53,7 @@ EOF
 new "yangmodels parse: -f $cfg"
 
 new "yangmodel Experimental IEEE 802.1: $YANGMODELS/experimental/ieee/802.1"
-expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -o CLICON_YANG_DIR=$YANGMODELS/experimental/ieee/1588 show version" 0 "3."
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/experimental/ieee/802.1 -p $YANGMODELS/experimental/ieee/1588 show version" 0 "3."
 
 # experimental 802.3 dir is empty
 #new "yangmodel Experimental IEEE 802.3: $YANGMODELS/experimental/ieee/802.3"
@@ -85,7 +86,24 @@ expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendo
 
 new "yangmodel vendor cisco xr 651: $YANGMODELS/vendor/cisco/xr/651"
 expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/cisco/xr/651 show version" 0 "3."
-fi
+fi ### cisco
+
+# vendor/junos
+#junos           : M/MX, T/TX, Some EX platforms, ACX
+#junos-es        : SRX, Jseries, LN-*
+#junos-ex        : EX series
+#junos-qfx       : QFX series
+#junos-nfx       : NFX series
+
+new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf/"
+expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_FILE=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf/junos-conf-interfaces@2018-01-01.yang -p $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
+
+# breaks memory and cpu limits,...
+#new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf"
+#expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/conf -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
+
+#new "yangmodel vendor junos: $YANGMODELS/vendor/juniper/18.2/18.2R1/junos/rpc"
+#expectfn "$clixon_cli -D $DBG -1f $cfg -o CLICON_YANG_MAIN_DIR=$YANGMODELS/vendor/juniper/18.2/18.2R1/junos/rpc -p $YANGMODELS/vendor/juniper/18.2/18.2R1/common show version" 0 "3."
 
 rm -rf $dir
 
diff --git a/yang/Makefile.in b/yang/Makefile.in
index 3d8e38dd..aa7ceb39 100644
--- a/yang/Makefile.in
+++ b/yang/Makefile.in
@@ -37,40 +37,48 @@ prefix 		= @prefix@
 bindir 		= @bindir@
 includedir	= @includedir@
 datarootdir     = @datarootdir@
+enable_stdyangs	= @enable_stdyangs@
 
 CLIXON_DATADIR   = @CLIXON_DATADIR@
 
-YANGSPECS	 = clixon-config@2018-10-21.yang
-YANGSPECS	+= clixon-lib@2019-01-02.yang
-YANGSPECS	+= ietf-netconf@2011-06-01.yang
-YANGSPECS	+= ietf-netconf-acm@2018-02-14.yang
-YANGSPECS	+= ietf-inet-types@2013-07-15.yang
-YANGSPECS	+= ietf-yang-types@2013-07-15.yang
-YANGSPECS	+= ietf-restconf@2017-01-26.yang
-YANGSPECS	+= ietf-restconf-monitoring@2017-01-26.yang
-YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
-YANGSPECS	+= ietf-yang-library@2016-06-21.yang
+SUBDIRS  = clixon
+# See configure.ac
+ifeq ($(enable_stdyangs),yes)
+SUBDIRS += standard
+endif
 
-APPNAME	        = clixon  # subdir ehere these files are installed
+.PHONY: all clean depend install $(SUBDIRS)
 
-all:	
+all:	$(SUBDIRS)
+
+depend:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
+
+$(SUBDIRS):
+	(cd $@; $(MAKE) $(MFLAGS) all)
+
+install-include:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) $@||exit 1); done; 
+
+install:
+	for i in $(SUBDIRS); \
+	do (cd $$i && $(MAKE) $(MFLAGS) $@)||exit 1; done
+
+uninstall:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@)||exit 1; done
 
 clean:
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
 distclean: clean
 	rm -f Makefile *~ .depend
+	for i in $(SUBDIRS); \
+	do (cd $$i; $(MAKE) $(MFLAGS) $@); done
 
-install: $(YANGSPECS) 
-	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
-	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
-
-uninstall:
-	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
-
-install-include:	
-
-depend:
-
-
-#include .depend
+TAGS:
+	find $(srcdir) -name '*.[chyl]' -print | etags -
 
diff --git a/yang/clixon-config@2017-07-02.yang b/yang/clixon-config@2017-07-02.yang
deleted file mode 100644
index cbc6e86c..00000000
--- a/yang/clixon-config@2017-07-02.yang
+++ /dev/null
@@ -1,220 +0,0 @@
- module clixon-config {
-
-    prefix cc;
-
-    organization
-      "Clicon / Clixon";
-
-    contact
-      "Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-        Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-07-02 {
-      description
-        "Added startup config";
-    }
-    typedef startup_mode{
-	description "Which method to boot/start clicon backend.
-                     The methods differ in how they reach a running state
-                     Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description "Do not touch running state
-                     Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description "Initialize running state.
-                             Start with a completely clean running state";
-	    }
-	    enum running{
-		description "Commit running db configuration into running state
-                             After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description "Commit startup configuration into running state
-                             After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    container config {
-    leaf CLICON_CONFIGFILE{
-    	 type string;
-	 description  "Location of configuration-file for default values (this file)";
-    }
-    leaf CLICON_YANG_DIR {
-       type string;
-       mandatory true;
-       description "Location of YANG module and submodule files. Only if CLICON_DBSPEC_TYPE is YANG";
-    }
-    leaf CLICON_YANG_MODULE_MAIN {
-       type string;
-       default "clicon";
-       description "Option used to construct initial yang file:
-                    <module>[@<revision>]
-		    This option is only relevant if CLICON_DBSPEC_TYPE is YANG";
-    }
-    leaf CLICON_YANG_MODULE_REVISION {
-       type string;
-       description "Option used to construct initial yang file:
-                    <module>[@<revision>]";
-    }
-    leaf CLICON_BACKEND_DIR {
-       type string;
-       description "Location of backend .so plugins. Load all .so 
-                    plugins in this dir as backend plugins";
-    }
-    leaf CLICON_NETCONF_DIR {
-       type string;
-       description "Location of netconf (frontend) .so plugins";
-    }
-    leaf CLICON_RESTCONF_DIR {
-       type string;
-       description "Location of restconf (frontend) .so plugins. Load all .so
-                    plugins in this dir as restconf code plugins";
-    }
-    leaf CLICON_RESTCONF_PATH {
-       type string;
-       default "/www-data/fastcgi_restconf.sock";
-       description "FastCGI unix socket. Should be specified in webserver
-                    Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-    }
-    leaf CLICON_CLI_DIR {
-       type string;
-       description "Location of cli frontend .so plugins. Load all .so 
-                    plugins in this dir as CLI object plugins";
-    }
-    leaf CLICON_CLISPEC_DIR {
-       type string;
-       description "Location of frontend .cli cligen spec files. Load all .cli 
-                    files in this dir as CLI specification files";
-    }
-    leaf CLICON_CLISPEC_FILE {
-       type string;
-       description "Specific frontend .cli cligen spec file.";
-    }
-    leaf CLICON_CLI_MODE {
-       type string;
-       default "base";
-       description "Startup CLI mode. This should match a CLICON_MODE set in
-                    one of the clispec files";
-    }
-    leaf CLICON_CLI_GENMODEL {
-       type int32;
-       default 1;
-       description "Generate code for CLI completion of existing db symbols. 
-                    Example: Add name=\"myspec\" in datamodel spec and reference
-		    as @myspec";
-    }
-    leaf CLICON_CLI_GENMODEL_COMPLETION {
-       type int32;
-       default 1;
-       description "Generate code for CLI completion of existing db symbols";
-    }
-    leaf CLICON_CLI_GENMODEL_TYPE {
-       type string;
-       default "VARS";
-       description "How to generate and show CLI syntax: VARS|ALL";
-    }
-    leaf CLICON_CLI_VARONLY {
-       type int32;
-       default 1;
-       description "Dont include keys in cvec in cli vars callbacks, ie a & k in 'a <b> k <c>' ignored";
-    }
-    leaf CLICON_CLI_LINESCROLLING {
-      type int32;
-      default 1;
-      description "Set to 0 if you want CLI to wrap to next line.
-                   Set to 1 if you  want CLI to scroll sideways when approaching right margin";
-    }
-
-    leaf CLICON_SOCK_FAMILY {
-       type string;
-       default "UNIX";
-       description "Address family for communicating with clixon_backend (UNIX|IPv4|IPv6)";
-    }
-    leaf CLICON_SOCK {
-       type string;
-       mandatory true;
-       description "If family above is AF_UNIX: Unix socket for communicating 
-       		    with clixon_backend. If family is AF_INET: IPv4 address";
-    }
-    leaf CLICON_SOCK_PORT {
-       type int32;
-       default 4535;
-       description "Inet socket port for communicating with clixon_backend (only IPv4|IPv6)";
-    }
-    leaf CLICON_SOCK_GROUP {
-       type string;
-       default "clicon";
-       description "Group membership to access clixon_backend unix socket";
-    }
-    leaf CLICON_BACKEND_PIDFILE {
-       type string;
-       mandatory true;
-       description "Process-id file";
-    }
-    leaf CLICON_AUTOCOMMIT {
-       type int32;
-       default 0;
-       description "Set if all configuration changes are committed directly, 
-                    commit command unnecessary";
-    }
-    leaf CLICON_MASTER_PLUGIN {
-       type string;
-       default "master";
-       description "Name of master plugin (both frontend and backend). 
-                    Master plugin has special callbacks for frontends. 
-		    See clicon user manual for more info. (Obsolete)";
-    }
-    leaf CLICON_XMLDB_DIR {
-       type string;
-       mandatory true;
-       description "Directory where \"running\", \"candidate\" and \"startup\" are placed";
-    }
-    leaf CLICON_USE_STARTUP_CONFIG {
-       type int32;
-       default 0;
-       description "Enabled uses \"startup\" configuration on boot. It is called
-                    startup_db and exists in XMLDB_DIR. NOTE: Obsolete with CLICON_STARTUP_MODE";
-    }
-    leaf CLICON_XMLDB_PLUGIN {
-       type string;
-       mandatory true;
-       description "XMLDB datastore plugin filename (see datastore/ and clixon_xml_db.[ch])";
-    }
-    leaf CLICON_STARTUP_MODE {
-	type startup_mode;
-	description "Which method to boot/start clicon backend";
-    }
-
-  }
-}
diff --git a/yang/clixon-config@2017-12-03.yang b/yang/clixon-config@2017-12-03.yang
deleted file mode 100644
index 5ffa1a5c..00000000
--- a/yang/clixon-config@2017-12-03.yang
+++ /dev/null
@@ -1,256 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-12-03 {
-	description
-	    "Added startup config for Clixon 1.3.3 and xmldb_cache in 1.4.0";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML parsed tree is stored in memory";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2017-12-27.yang b/yang/clixon-config@2017-12-27.yang
deleted file mode 100644
index 1bbc1dcb..00000000
--- a/yang/clixon-config@2017-12-27.yang
+++ /dev/null
@@ -1,291 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2017 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2017-12-27 {
-	description
-	    "Added xml sort option for 1.4.0";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2018-02-12.yang b/yang/clixon-config@2018-02-12.yang
deleted file mode 100644
index 883a002f..00000000
--- a/yang/clixon-config@2018-02-12.yang
+++ /dev/null
@@ -1,304 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2018-02-12 {
-	description
-	    "Added pretty print for datastore";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_RESTCONF_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"Restconf return value pretty print. 
-                 Restconf clients may add HTTP header:
-                      Accept: application/yang-data+json, or
-                      Accept: application/yang-data+xml
-                 to get return value in XML or JSON. 
-                 RFC 8040 examples print XML and JSON in pretty-printed form.
-                 Setting this value to false makes restconf return not pretty-printed
-                 which may be desirable for performance or tests";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type string;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_MASTER_PLUGIN {
-	    type string;
-	    default "master";
-	    description
-		"Name of master plugin (both frontend and backend). 
-                 Master plugin has special callbacks for frontends. 
-	         See clicon user manual for more info. (Obsolete?)";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-    }
-}
diff --git a/yang/clixon-config@2018-04-30.yang b/yang/clixon-config@2018-04-30.yang
deleted file mode 100644
index d395e543..00000000
--- a/yang/clixon-config@2018-04-30.yang
+++ /dev/null
@@ -1,353 +0,0 @@
-module clixon-config {
-
-    prefix cc;
-
-    organization
-	"Clicon / Clixon";
-
-    contact
-	"Olof Hagsand <olof@hagsand.se>";
-
-    description
-      "Clixon configuration file
-       ***** BEGIN LICENSE BLOCK *****
-       Copyright (C) 2009-2018 Olof Hagsand and Benny Holmgren
-       
-       This file is part of CLIXON
-
-       Licensed under the Apache License, Version 2.0 (the \"License\");
-       you may not use this file except in compliance with the License.
-       You may obtain a copy of the License at
-            http://www.apache.org/licenses/LICENSE-2.0
-       Unless required by applicable law or agreed to in writing, software
-       distributed under the License is distributed on an \"AS IS\" BASIS,
-       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-       See the License for the specific language governing permissions and
-       limitations under the License.
-
-       Alternatively, the contents of this file may be used under the terms of
-       the GNU General Public License Version 3 or later (the \"GPL\"),
-       in which case the provisions of the GPL are applicable instead
-       of those above. If you wish to allow use of your version of this file only
-       under the terms of the GPL, and not to allow others to
-       use your version of this file under the terms of Apache License version 2, 
-       indicate your decision by deleting the provisions above and replace them with
-       the notice and other provisions required by the GPL. If you do not delete
-       the provisions above, a recipient may use your version of this file under
-       the terms of any one of the Apache License version 2 or the GPL.
-
-       ***** END LICENSE BLOCK *****";
-
-    revision 2018-04-30 {
-	description
-	    "Released with Clixon 3.6";
-    }
-    typedef startup_mode{
-	description
-	    "Which method to boot/start clicon backend.
-             The methods differ in how they reach a running state
-             Which source database to commit from, if any.";
-	type enumeration{
-	    enum none{
-		description
-		"Do not touch running state
-                 Typically after crash when running state and db are synched";
-	    }
-	    enum init{
-		description
-		"Initialize running state.
-                 Start with a completely clean running state";
-	    }
-	    enum running{
-		description
-		"Commit running db configuration into running state
-                 After reboot if a persistent running db exists";
-	    }
-	    enum startup{
-		description
-		"Commit startup configuration into running state
-                 After reboot when no persistent running db exists";
-	    }
-	}
-    }
-    typedef xmldb_format{
-	description
-	    "Format of TEXT xml database format.";
-	type enumeration{
-	    enum xml{
-		description "Save and load xmldb as XML";
-	    }
-	    enum json{
-		description "Save and load xmldb as JSON";
-	    }
-	}
-    }
-    typedef cli_genmodel_type{
-	description
-	    "How to generate CLI from YANG model, 
-             eg list a{ key x; leaf x; leaf y;}";
-	type enumeration{
-	    enum NONE{
-		description "No extra keywords: a <x> <y>";
-	    }
-	    enum VARS{
-		description "Keywords on non-key variables: a <x> y <y>";
-	    }
-	    enum ALL{
-		description "Keywords on all variables: a x <x> y <y>";
-	    }
-	}
-    }
-    typedef nacm_mode{
-	description
-	    "Mode of RFC8341 Network Configuration Access Control Model.
-             It is unclear from the RFC whether NACM rules are internal
-             in a configuration (ie embedded in regular config) or external/OOB
-             in s separate, specific NACM-config";
-	type enumeration{
-	    enum disabled{
-		description "NACM is disabled";
-	    }
-	    enum internal{
-		description "NACM is enabled and available in the regular config";
-	    }
-	    enum external{
-		description "NACM is enabled and available in a separate config";
-	    }
-	}
-    }
-    container config {
-	leaf CLICON_CONFIGFILE{
-	    type string;
-	    description
-		"Location of configuration-file for default values (this file)";
-	}
-	leaf CLICON_YANG_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Location of YANG module and submodule files.";
-	}
-	leaf CLICON_YANG_MODULE_MAIN {
-	    type string;
-            default "clicon";
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_YANG_MODULE_REVISION {
-	    type string;
-	    description
-		"Option used to construct initial yang file: 
-                 <module>[@<revision>]";
-	}
-	leaf CLICON_BACKEND_DIR {
-	    type string;
-	    description
-		"Location of backend .so plugins. Load all .so 
-       	         plugins in this dir as backend plugins";
-	}
-	leaf CLICON_BACKEND_REGEXP {
-	    type string;
-	    description
-		"Regexp of matching backend plugins in CLICON_BACKEND_DIR";
-	    default "(.so)$";
-	}
-	leaf CLICON_NETCONF_DIR {
-	    type string;
-	    description "Location of netconf (frontend) .so plugins";
-	}
-	leaf CLICON_RESTCONF_DIR {
-	    type string;
-	    description
-		"Location of restconf (frontend) .so plugins. Load all .so
-       	         plugins in this dir as restconf code plugins";
-	}
-	leaf CLICON_RESTCONF_PATH {
-	    type string;
-	    default "/www-data/fastcgi_restconf.sock";
-	    description
-		"FastCGI unix socket. Should be specified in webserver
-         	 Eg in nginx: fastcgi_pass unix:/www-data/clicon_restconf.sock";
-	}
-	leaf CLICON_RESTCONF_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"Restconf return value pretty print. 
-                 Restconf clients may add HTTP header:
-                      Accept: application/yang-data+json, or
-                      Accept: application/yang-data+xml
-                 to get return value in XML or JSON. 
-                 RFC 8040 examples print XML and JSON in pretty-printed form.
-                 Setting this value to false makes restconf return not pretty-printed
-                 which may be desirable for performance or tests";
-	}
-	leaf CLICON_CLI_DIR {
-	    type string;
-	    description
-		"Location of cli frontend .so plugins. Load all .so 
-                 plugins in this dir as CLI object plugins";
-	}
-	leaf CLICON_CLISPEC_DIR {
-	    type string;
-	    description
-		"Location of frontend .cli cligen spec files. Load all .cli 
-       	         files in this dir as CLI specification files";
-	}
-	leaf CLICON_CLISPEC_FILE {
-	    type string;
-	    description "Specific frontend .cli cligen spec file.";
-	}
-	leaf CLICON_CLI_MODE {
-	    type string;
-	    default "base";
-	    description
-		"Startup CLI mode. This should match a CLICON_MODE set in
-                 one of the clispec files";
-	}
-	leaf CLICON_CLI_GENMODEL {
-	    type int32;
-	    default 1;
-	    description
-		"Generate code for CLI completion of existing db symbols. 
-      	         Example: Add name=\"myspec\" in datamodel spec and reference
-	         as @myspec";
-	}
-	leaf CLICON_CLI_GENMODEL_COMPLETION {
-	    type int32;
-	    default 1;
-	    description "Generate code for CLI completion of existing db symbols";
-	}
-	leaf CLICON_CLI_GENMODEL_TYPE {
-	    type cli_genmodel_type;
-	    default "VARS";
-	    description "How to generate and show CLI syntax: VARS|ALL";
-	}
-	leaf CLICON_CLI_VARONLY {
-	    type int32;
-	    default 1;
-	    description
-		"Dont include keys in cvec in cli vars callbacks, 
-          	 ie a & k in 'a <b> k <c>' ignored";
-	}
-	leaf CLICON_CLI_LINESCROLLING {
-	    type int32;
-	    default 1;
-	    description
-		"Set to 0 if you want CLI to wrap to next line.
-                 Set to 1 if you  want CLI to scroll sideways when approaching 
-                      right margin";
-	}
-	leaf CLICON_SOCK_FAMILY {
-	    type string;
-	    default "UNIX";
-	    description
-		"Address family for communicating with clixon_backend 
-                 (UNIX|IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK {
-	    type string;
-	    mandatory true;
-	    description
-		"If family above is AF_UNIX: Unix socket for communicating 
-       	         with clixon_backend. If family is AF_INET: IPv4 address";
-	}
-	leaf CLICON_SOCK_PORT {
-	    type int32;
-	    default 4535;
-	    description
-		"Inet socket port for communicating with clixon_backend 
-                 (only IPv4|IPv6)";
-	}
-	leaf CLICON_SOCK_GROUP {
-	    type string;
-	    default "clicon";
-	    description "Group membership to access clixon_backend unix socket";
-	}
-	leaf CLICON_BACKEND_PIDFILE {
-	    type string;
-	    mandatory true;
-	    description "Process-id file of backend daemon";
-	}
-	leaf CLICON_AUTOCOMMIT {
-	    type int32;
-	    default 0;
-	    description
-		"Set if all configuration changes are committed automatically 
-                 on every edit change. Explicit commit commands unnecessary";
-	}
-	leaf CLICON_XMLDB_DIR {
-	    type string;
-	    mandatory true;
-	    description
-		"Directory where \"running\", \"candidate\" and \"startup\" are placed";
-	}
-	leaf CLICON_XMLDB_PLUGIN {
-	    type string;
-	    mandatory true;
-	    description
-		"XMLDB datastore plugin filename 
-	         (see datastore/ and clixon_xml_db.[ch])";
-	}
-	leaf CLICON_XMLDB_CACHE {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore cache. 
-                 If set, XML candidate/running parsed tree is stored in memory
-                 If not set, candidate/running is always accessed via disk.";
-	}
-	leaf CLICON_XMLDB_FORMAT {
-	    type xmldb_format;
-	    default xml;
-	    description	"XMLDB datastore format.";
-	}
-	leaf CLICON_XMLDB_PRETTY {
-	    type boolean;
-	    default true;
-	    description
-		"XMLDB datastore pretty print. 
-                 If set, insert spaces and line-feeds making the XML/JSON human
-                 readable. If not set, make the XML/JSON more compact.";
-	}
-	leaf CLICON_XML_SORT {
-	    type boolean;
-	    default true;
-	    description
-		"If set, sort XML lists and leaf-lists alphabetically and uses binary
-                 search. Unless ordered-by user is used. 
-                 Only works for Yang specified XML.
-                 If not set, all lists accessed via linear search.";
-	}
-	leaf CLICON_USE_STARTUP_CONFIG {
-	    type int32;
-	    default 0;
-	    description
-		"Enabled uses \"startup\" configuration on boot. It is called
-                 startup_db and exists in XMLDB_DIR. 
-	         NOTE: Obsolete with 1.3.3 and CLICON_STARTUP_MODE";
-	}
-	leaf CLICON_STARTUP_MODE {
-	    type startup_mode;
-	    description "Which method to boot/start clicon backend";
-	}
-	leaf CLICON_TRANSACTION_MOD {
-	    type boolean;
-	    default false;
-	    description "If set, modifications in validation and commit 
-                         callbacks are written back into the datastore";
-	}
-	leaf CLICON_NACM_MODE {
-	    type nacm_mode;
-	    default disabled;
-	    description "RFC8341 network access configuration control model 
-                         (NACM) mode: disabled, in regular (internal) config
-                         or separate external file given by CLICON_NACM_FILE";
-	}
-	leaf CLICON_NACM_FILE {
-	    type string;
-	    description "RFC8341 NACM external configuration file";
-	}
-    }
-}
diff --git a/yang/clixon/Makefile.in b/yang/clixon/Makefile.in
new file mode 100644
index 00000000..1f9c99a2
--- /dev/null
+++ b/yang/clixon/Makefile.in
@@ -0,0 +1,69 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+VPATH       	= @srcdir@
+srcdir  	= @srcdir@
+top_srcdir  	= @top_srcdir@
+prefix 		= @prefix@
+bindir 		= @bindir@
+includedir	= @includedir@
+datarootdir     = @datarootdir@
+
+CLIXON_DATADIR   = @CLIXON_DATADIR@
+
+YANGSPECS	 = clixon-config@2018-10-21.yang
+YANGSPECS	+= clixon-lib@2019-01-02.yang
+YANGSPECS	+= clixon-rfc5277@2008-07-01.yang
+
+APPNAME	        = clixon  # subdir ehere these files are installed
+
+all:	
+
+clean:
+
+distclean: clean
+	rm -f Makefile *~ .depend
+
+install: $(YANGSPECS) 
+	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
+
+uninstall:
+	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
+
+install-include:	
+
+depend:
+
+
+#include .depend
+
diff --git a/yang/clixon-config@2018-10-21.yang b/yang/clixon/clixon-config@2018-10-21.yang
similarity index 99%
rename from yang/clixon-config@2018-10-21.yang
rename to yang/clixon/clixon-config@2018-10-21.yang
index a9ad7414..5b9e3f20 100644
--- a/yang/clixon-config@2018-10-21.yang
+++ b/yang/clixon/clixon-config@2018-10-21.yang
@@ -134,6 +134,7 @@ module clixon-config {
 		"Location of configuration-file for default values (this file)";
 	}
 	leaf-list CLICON_YANG_DIR {
+	    ordered-by user;
 	    type string;
 	    description
 		"Yang directory path for finding module and submodule files. 
diff --git a/yang/clixon-lib@2019-01-02.yang b/yang/clixon/clixon-lib@2019-01-02.yang
similarity index 100%
rename from yang/clixon-lib@2019-01-02.yang
rename to yang/clixon/clixon-lib@2019-01-02.yang
diff --git a/yang/clixon-rfc5277@2008-07-01.yang b/yang/clixon/clixon-rfc5277@2008-07-01.yang
similarity index 100%
rename from yang/clixon-rfc5277@2008-07-01.yang
rename to yang/clixon/clixon-rfc5277@2008-07-01.yang
diff --git a/yang/ietf-inet-types@2013-07-15.yang b/yang/ietf-inet-types@2013-07-15.yang
deleted file mode 100644
index ef3b9d47..00000000
--- a/yang/ietf-inet-types@2013-07-15.yang
+++ /dev/null
@@ -1,457 +0,0 @@
-   module ietf-inet-types {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-inet-types";
-     prefix "inet";
-
-     organization
-      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-      "WG Web:   <http://tools.ietf.org/wg/netmod/>
-       WG List:  <mailto:netmod@ietf.org>
-
-       WG Chair: David Kessens
-                 <mailto:david.kessens@nsn.com>
-
-       WG Chair: Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>
-
-       Editor:   Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>";
-
-     description
-      "This module contains a collection of generally useful derived
-       YANG data types for Internet addresses and related things.
-
-       Copyright (c) 2013 IETF Trust and the persons identified as
-       authors of the code.  All rights reserved.
-
-       Redistribution and use in source and binary forms, with or
-       without modification, is permitted pursuant to, and subject
-       to the license terms contained in, the Simplified BSD License
-       set forth in Section 4.c of the IETF Trust's Legal Provisions
-       Relating to IETF Documents
-       (http://trustee.ietf.org/license-info).
-
-       This version of this YANG module is part of RFC 6991; see
-       the RFC itself for full legal notices.";
-
-     revision 2013-07-15 {
-       description
-        "This revision adds the following new data types:
-         - ip-address-no-zone
-         - ipv4-address-no-zone
-         - ipv6-address-no-zone";
-       reference
-        "RFC 6991: Common YANG Data Types";
-     }
-
-     revision 2010-09-24 {
-       description
-        "Initial revision.";
-       reference
-        "RFC 6021: Common YANG Data Types";
-     }
-
-     /*** collection of types related to protocol fields ***/
-
-     typedef ip-version {
-       type enumeration {
-         enum unknown {
-           value "0";
-           description
-            "An unknown or unspecified version of the Internet
-             protocol.";
-         }
-         enum ipv4 {
-           value "1";
-           description
-            "The IPv4 protocol as defined in RFC 791.";
-         }
-         enum ipv6 {
-           value "2";
-           description
-            "The IPv6 protocol as defined in RFC 2460.";
-         }
-       }
-       description
-        "This value represents the version of the IP protocol.
-
-         In the value set and its semantics, this type is equivalent
-         to the InetVersion textual convention of the SMIv2.";
-       reference
-        "RFC  791: Internet Protocol
-         RFC 2460: Internet Protocol, Version 6 (IPv6) Specification
-         RFC 4001: Textual Conventions for Internet Network Addresses";
-     }
-
-     typedef dscp {
-       type uint8 {
-         range "0..63";
-       }
-       description
-        "The dscp type represents a Differentiated Services Code Point
-         that may be used for marking packets in a traffic stream.
-         In the value set and its semantics, this type is equivalent
-         to the Dscp textual convention of the SMIv2.";
-       reference
-        "RFC 3289: Management Information Base for the Differentiated
-                   Services Architecture
-         RFC 2474: Definition of the Differentiated Services Field
-                   (DS Field) in the IPv4 and IPv6 Headers
-         RFC 2780: IANA Allocation Guidelines For Values In
-                   the Internet Protocol and Related Headers";
-     }
-
-     typedef ipv6-flow-label {
-       type uint32 {
-         range "0..1048575";
-       }
-       description
-        "The ipv6-flow-label type represents the flow identifier or Flow
-         Label in an IPv6 packet header that may be used to
-         discriminate traffic flows.
-
-         In the value set and its semantics, this type is equivalent
-         to the IPv6FlowLabel textual convention of the SMIv2.";
-       reference
-        "RFC 3595: Textual Conventions for IPv6 Flow Label
-         RFC 2460: Internet Protocol, Version 6 (IPv6) Specification";
-     }
-
-     typedef port-number {
-       type uint16 {
-         range "0..65535";
-       }
-       description
-        "The port-number type represents a 16-bit port number of an
-         Internet transport-layer protocol such as UDP, TCP, DCCP, or
-         SCTP.  Port numbers are assigned by IANA.  A current list of
-         all assignments is available from <http://www.iana.org/>.
-
-         Note that the port number value zero is reserved by IANA.  In
-         situations where the value zero does not make sense, it can
-         be excluded by subtyping the port-number type.
-         In the value set and its semantics, this type is equivalent
-         to the InetPortNumber textual convention of the SMIv2.";
-       reference
-        "RFC  768: User Datagram Protocol
-         RFC  793: Transmission Control Protocol
-         RFC 4960: Stream Control Transmission Protocol
-         RFC 4340: Datagram Congestion Control Protocol (DCCP)
-         RFC 4001: Textual Conventions for Internet Network Addresses";
-     }
-
-     /*** collection of types related to autonomous systems ***/
-
-     typedef as-number {
-       type uint32;
-       description
-        "The as-number type represents autonomous system numbers
-         which identify an Autonomous System (AS).  An AS is a set
-         of routers under a single technical administration, using
-         an interior gateway protocol and common metrics to route
-         packets within the AS, and using an exterior gateway
-         protocol to route packets to other ASes.  IANA maintains
-         the AS number space and has delegated large parts to the
-         regional registries.
-
-         Autonomous system numbers were originally limited to 16
-         bits.  BGP extensions have enlarged the autonomous system
-         number space to 32 bits.  This type therefore uses an uint32
-         base type without a range restriction in order to support
-         a larger autonomous system number space.
-
-         In the value set and its semantics, this type is equivalent
-         to the InetAutonomousSystemNumber textual convention of
-         the SMIv2.";
-       reference
-        "RFC 1930: Guidelines for creation, selection, and registration
-                   of an Autonomous System (AS)
-         RFC 4271: A Border Gateway Protocol 4 (BGP-4)
-         RFC 4001: Textual Conventions for Internet Network Addresses
-         RFC 6793: BGP Support for Four-Octet Autonomous System (AS)
-                   Number Space";
-     }
-
-     /*** collection of types related to IP addresses and hostnames ***/
-
-     typedef ip-address {
-       type union {
-         type inet:ipv4-address;
-         type inet:ipv6-address;
-       }
-       description
-        "The ip-address type represents an IP address and is IP
-         version neutral.  The format of the textual representation
-         implies the IP version.  This type supports scoped addresses
-         by allowing zone identifiers in the address format.";
-       reference
-        "RFC 4007: IPv6 Scoped Address Architecture";
-     }
-
-     typedef ipv4-address {
-       type string {
-         pattern
-           '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-         +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-         + '(%[\p{N}\p{L}]+)?';
-       }
-       description
-         "The ipv4-address type represents an IPv4 address in
-          dotted-quad notation.  The IPv4 address may include a zone
-          index, separated by a % sign.
-
-          The zone index is used to disambiguate identical address
-          values.  For link-local addresses, the zone index will
-          typically be the interface index number or the name of an
-          interface.  If the zone index is not present, the default
-          zone of the device will be used.
-
-          The canonical format for the zone index is the numerical
-          format";
-     }
-
-     typedef ipv6-address {
-       type string {
-         pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-               + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-               + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-               + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-               + '(%[\p{N}\p{L}]+)?';
-         pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-               + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-               + '(%.+)?';
-       }
-       description
-        "The ipv6-address type represents an IPv6 address in full,
-         mixed, shortened, and shortened-mixed notation.  The IPv6
-         address may include a zone index, separated by a % sign.
-
-         The zone index is used to disambiguate identical address
-         values.  For link-local addresses, the zone index will
-         typically be the interface index number or the name of an
-         interface.  If the zone index is not present, the default
-         zone of the device will be used.
-
-         The canonical format of IPv6 addresses uses the textual
-         representation defined in Section 4 of RFC 5952.  The
-         canonical format for the zone index is the numerical
-         format as described in Section 11.2 of RFC 4007.";
-       reference
-        "RFC 4291: IP Version 6 Addressing Architecture
-         RFC 4007: IPv6 Scoped Address Architecture
-         RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     typedef ip-address-no-zone {
-       type union {
-         type inet:ipv4-address-no-zone;
-         type inet:ipv6-address-no-zone;
-       }
-       description
-        "The ip-address-no-zone type represents an IP address and is
-         IP version neutral.  The format of the textual representation
-         implies the IP version.  This type does not support scoped
-         addresses since it does not allow zone identifiers in the
-         address format.";
-       reference
-        "RFC 4007: IPv6 Scoped Address Architecture";
-     }
-
-     typedef ipv4-address-no-zone {
-       type inet:ipv4-address {
-         pattern '[0-9\.]*';
-       }
-       description
-         "An IPv4 address without a zone index.  This type, derived from
-          ipv4-address, may be used in situations where the zone is
-          known from the context and hence no zone index is needed.";
-     }
-
-     typedef ipv6-address-no-zone {
-       type inet:ipv6-address {
-         pattern '[0-9a-fA-F:\.]*';
-       }
-       description
-         "An IPv6 address without a zone index.  This type, derived from
-          ipv6-address, may be used in situations where the zone is
-          known from the context and hence no zone index is needed.";
-       reference
-        "RFC 4291: IP Version 6 Addressing Architecture
-         RFC 4007: IPv6 Scoped Address Architecture
-         RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     typedef ip-prefix {
-       type union {
-         type inet:ipv4-prefix;
-         type inet:ipv6-prefix;
-       }
-       description
-        "The ip-prefix type represents an IP prefix and is IP
-         version neutral.  The format of the textual representations
-         implies the IP version.";
-     }
-
-     typedef ipv4-prefix {
-       type string {
-         pattern
-            '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-          +  '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])'
-          + '/(([0-9])|([1-2][0-9])|(3[0-2]))';
-       }
-       description
-        "The ipv4-prefix type represents an IPv4 address prefix.
-         The prefix length is given by the number following the
-         slash character and must be less than or equal to 32.
-
-         A prefix length value of n corresponds to an IP address
-         mask that has n contiguous 1-bits from the most
-         significant bit (MSB) and all other bits set to 0.
-
-         The canonical format of an IPv4 prefix has all bits of
-         the IPv4 address set to zero that are not part of the
-         IPv4 prefix.";
-     }
-
-     typedef ipv6-prefix {
-       type string {
-         pattern '((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}'
-               + '((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|'
-               + '(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\.){3}'
-               + '(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))'
-               + '(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))';
-         pattern '(([^:]+:){6}(([^:]+:[^:]+)|(.*\..*)))|'
-               + '((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)'
-               + '(/.+)';
-       }
-       description
-        "The ipv6-prefix type represents an IPv6 address prefix.
-         The prefix length is given by the number following the
-         slash character and must be less than or equal to 128.
-
-         A prefix length value of n corresponds to an IP address
-         mask that has n contiguous 1-bits from the most
-         significant bit (MSB) and all other bits set to 0.
-
-         The IPv6 address should have all bits that do not belong
-         to the prefix set to zero.
-
-         The canonical format of an IPv6 prefix has all bits of
-         the IPv6 address set to zero that are not part of the
-         IPv6 prefix.  Furthermore, the IPv6 address is represented
-         as defined in Section 4 of RFC 5952.";
-       reference
-        "RFC 5952: A Recommendation for IPv6 Address Text
-                   Representation";
-     }
-
-     /*** collection of domain name and URI types ***/
-
-     typedef domain-name {
-       type string {
-         pattern
-           '((([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.)*'
-         + '([a-zA-Z0-9_]([a-zA-Z0-9\-_]){0,61})?[a-zA-Z0-9]\.?)'
-         + '|\.';
-         length "1..253";
-       }
-       description
-        "The domain-name type represents a DNS domain name.  The
-         name SHOULD be fully qualified whenever possible.
-
-         Internet domain names are only loosely specified.  Section
-         3.5 of RFC 1034 recommends a syntax (modified in Section
-         2.1 of RFC 1123).  The pattern above is intended to allow
-         for current practice in domain name use, and some possible
-         future expansion.  It is designed to hold various types of
-         domain names, including names used for A or AAAA records
-         (host names) and other records, such as SRV records.  Note
-         that Internet host names have a stricter syntax (described
-         in RFC 952) than the DNS recommendations in RFCs 1034 and
-         1123, and that systems that want to store host names in
-         schema nodes using the domain-name type are recommended to
-         adhere to this stricter standard to ensure interoperability.
-
-         The encoding of DNS names in the DNS protocol is limited
-         to 255 characters.  Since the encoding consists of labels
-         prefixed by a length bytes and there is a trailing NULL
-         byte, only 253 characters can appear in the textual dotted
-         notation.
-
-         The description clause of schema nodes using the domain-name
-         type MUST describe when and how these names are resolved to
-         IP addresses.  Note that the resolution of a domain-name value
-         may require to query multiple DNS records (e.g., A for IPv4
-         and AAAA for IPv6).  The order of the resolution process and
-         which DNS record takes precedence can either be defined
-         explicitly or may depend on the configuration of the
-         resolver.
-
-         Domain-name values use the US-ASCII encoding.  Their canonical
-         format uses lowercase US-ASCII characters.  Internationalized
-         domain names MUST be A-labels as per RFC 5890.";
-       reference
-        "RFC  952: DoD Internet Host Table Specification
-         RFC 1034: Domain Names - Concepts and Facilities
-         RFC 1123: Requirements for Internet Hosts -- Application
-                   and Support
-         RFC 2782: A DNS RR for specifying the location of services
-                   (DNS SRV)
-         RFC 5890: Internationalized Domain Names in Applications
-                   (IDNA): Definitions and Document Framework";
-     }
-
-     typedef host {
-       type union {
-         type inet:ip-address;
-         type inet:domain-name;
-       }
-       description
-        "The host type represents either an IP address or a DNS
-         domain name.";
-     }
-
-     typedef uri {
-       type string;
-       description
-        "The uri type represents a Uniform Resource Identifier
-         (URI) as defined by STD 66.
-
-         Objects using the uri type MUST be in US-ASCII encoding,
-         and MUST be normalized as described by RFC 3986 Sections
-         6.2.1, 6.2.2.1, and 6.2.2.2.  All unnecessary
-         percent-encoding is removed, and all case-insensitive
-         characters are set to lowercase except for hexadecimal
-         digits, which are normalized to uppercase as described in
-         Section 6.2.2.1.
-
-         The purpose of this normalization is to help provide
-         unique URIs.  Note that this normalization is not
-         sufficient to provide uniqueness.  Two URIs that are
-         textually distinct after this normalization may still be
-         equivalent.
-
-         Objects using the uri type may restrict the schemes that
-         they permit.  For example, 'data:' and 'urn:' schemes
-         might not be appropriate.
-
-         A zero-length URI is not a valid URI.  This can be used to
-         express 'URI absent' where required.
-
-         In the value set and its semantics, this type is equivalent
-         to the Uri SMIv2 textual convention defined in RFC 5017.";
-       reference
-        "RFC 3986: Uniform Resource Identifier (URI): Generic Syntax
-         RFC 3305: Report from the Joint W3C/IETF URI Planning Interest
-                   Group: Uniform Resource Identifiers (URIs), URLs,
-                   and Uniform Resource Names (URNs): Clarifications
-                   and Recommendations
-         RFC 5017: MIB Textual Conventions for Uniform Resource
-                   Identifiers (URIs)";
-     }
-
-   }
diff --git a/yang/ietf-restconf@2017-01-26.yang b/yang/ietf-restconf@2017-01-26.yang
deleted file mode 100644
index 249006af..00000000
--- a/yang/ietf-restconf@2017-01-26.yang
+++ /dev/null
@@ -1,279 +0,0 @@
-module ietf-restconf {
-    yang-version 1.1;
-    namespace "urn:ietf:params:xml:ns:yang:ietf-restconf";
-    prefix "rc";
-
-    organization
-	"IETF NETCONF (Network Configuration) Working Group";
-
-    contact
-	"WG Web:   <https://datatracker.ietf.org/wg/netconf/>
-        WG List:  <mailto:netconf@ietf.org>
-
-        Author:   Andy Bierman
-                  <mailto:andy@yumaworks.com>
-
-        Author:   Martin Bjorklund
-                  <mailto:mbj@tail-f.com>
-
-        Author:   Kent Watsen
-                  <mailto:kwatsen@juniper.net>";
-
-    description
-	"This module contains conceptual YANG specifications
-        for basic RESTCONF media type definitions used in
-        RESTCONF protocol messages.
-
-        Note that the YANG definitions within this module do not
-        represent configuration data of any kind.
-        The 'restconf-media-type' YANG extension statement
-        provides a normative syntax for XML and JSON
-        message-encoding purposes.
-
-        Copyright (c) 2017 IETF Trust and the persons identified as
-        authors of the code.  All rights reserved.
-
-        Redistribution and use in source and binary forms, with or
-        without modification, is permitted pursuant to, and subject
-        to the license terms contained in, the Simplified BSD License
-        set forth in Section 4.c of the IETF Trust's Legal Provisions
-        Relating to IETF Documents
-        (http://trustee.ietf.org/license-info).
-
-        This version of this YANG module is part of RFC 8040; see
-        the RFC itself for full legal notices.";
-
-    revision 2017-01-26 {
-	description
-	    "Initial revision.";
-	reference
-	    "RFC 8040: RESTCONF Protocol.";
-    }
-
-    extension yang-data {
-	argument name {
-	    yin-element true;
-	}
-	description
-	    "This extension is used to specify a YANG data template that
-          represents conceptual data defined in YANG.  It is
-          intended to describe hierarchical data independent of
-          protocol context or specific message-encoding format.
-          Data definition statements within a yang-data extension
-          specify the generic syntax for the specific YANG data
-          template, whose name is the argument of the 'yang-data'
-          extension statement.
-
-          Note that this extension does not define a media type.
-          A specification using this extension MUST specify the
-          message-encoding rules, including the content media type.
-
-          The mandatory 'name' parameter value identifies the YANG
-          data template that is being defined.  It contains the
-          template name.
-
-          This extension is ignored unless it appears as a top-level
-          statement.  It MUST contain data definition statements
-          that result in exactly one container data node definition.
-          An instance of a YANG data template can thus be translated
-          into an XML instance document, whose top-level element
-          corresponds to the top-level container.
-
-          The module name and namespace values for the YANG module using
-          the extension statement are assigned to instance document data
-          conforming to the data definition statements within
-          this extension.
-
-          The substatements of this extension MUST follow the
-          'data-def-stmt' rule in the YANG ABNF.
-
-          The XPath document root is the extension statement itself,
-          such that the child nodes of the document root are
-          represented by the data-def-stmt substatements within
-          this extension.  This conceptual document is the context
-          for the following YANG statements:
-
-            - must-stmt
-            - when-stmt
-            - path-stmt
-            - min-elements-stmt
-            - max-elements-stmt
-            - mandatory-stmt
-            - unique-stmt
-            - ordered-by
-            - instance-identifier data type
-
-          The following data-def-stmt substatements are constrained
-          when used within a 'yang-data' extension statement.
-
-            - The list-stmt is not required to have a key-stmt defined.
-            - The if-feature-stmt is ignored if present.
-            - The config-stmt is ignored if present.
-            - The available identity values for any 'identityref'
-              leaf or leaf-list nodes are limited to the module
-              containing this extension statement and the modules
-              imported into that module.
-         ";
-    }
-
-    rc:yang-data yang-errors {
-	uses errors;
-    }
-
-    rc:yang-data yang-api {
-	uses restconf;
-    }
-
-    grouping errors {
-	description
-	    "A grouping that contains a YANG container
-          representing the syntax and semantics of a
-          YANG Patch error report within a response message.";
-
-	container errors {
-	    description
-		"Represents an error report returned by the server if
-            a request results in an error.";
-
-	    list error {
-		description
-		    "An entry containing information about one
-              specific error that occurred while processing
-              a RESTCONF request.";
-		reference
-		    "RFC 6241, Section 4.3.";
-
-		leaf error-type {
-		    type enumeration {
-			enum transport {
-			    description
-			    "The transport layer.";
-			}
-			enum rpc {
-			    description
-				"The rpc or notification layer.";
-			}
-			enum protocol {
-			    description
-			    "The protocol operation layer.";
-			}
-			enum application {
-			    description
-			    "The server application layer.";
-			}
-		    }
-		    mandatory true;
-		    description
-			"The protocol layer where the error occurred.";
-		}
-
-		leaf error-tag {
-		    type string;
-		    mandatory true;
-		    description
-			"The enumerated error-tag.";
-		}
-
-		leaf error-app-tag {
-		    type string;
-		    description
-			"The application-specific error-tag.";
-		}
-
-		leaf error-path {
-		    type instance-identifier;
-		    description
-			"The YANG instance identifier associated
-                with the error node.";
-		}
-
-		leaf error-message {
-		    type string;
-		    description
-			"A message describing the error.";
-		}
-
-		anydata error-info {
-		    description
-			"This anydata value MUST represent a container with
-                 zero or more data nodes representing additional
-                 error information.";
-		}
-	    }
-	}
-    }
-
-    grouping restconf {
-	description
-	    "Conceptual grouping representing the RESTCONF
-          root resource.";
-
-	container restconf {
-	    description
-		"Conceptual container representing the RESTCONF
-            root resource.";
-	    container data {
-		description
-		    "Container representing the datastore resource.
-              Represents the conceptual root of all state data
-              and configuration data supported by the server.
-              The child nodes of this container can be any data
-              resources that are defined as top-level data nodes
-              from the YANG modules advertised by the server in
-              the 'ietf-yang-library' module.";
-	    }
-
-	    container operations {
-		description
-		    "Container for all operation resources.
-
-              Each resource is represented as an empty leaf with the
-              name of the RPC operation from the YANG 'rpc' statement.
-
-              For example, the 'system-restart' RPC operation defined
-              in the 'ietf-system' module would be represented as
-              an empty leaf in the 'ietf-system' namespace.  This is
-              a conceptual leaf and will not actually be found in
-              the module:
-
-                 module ietf-system {
-                   leaf system-reset {
-                     type empty;
-                   }
-                 }
-
-              To invoke the 'system-restart' RPC operation:
-
-                 POST /restconf/operations/ietf-system:system-restart
-
-              To discover the RPC operations supported by the server:
-
-                 GET /restconf/operations
-
-              In XML, the YANG module namespace identifies the module:
-
-                <system-restart
-                   xmlns='urn:ietf:params:xml:ns:yang:ietf-system'/>
-
-              In JSON, the YANG module name identifies the module:
-
-                { 'ietf-system:system-restart' : [null] }
-             ";
-	    }
-	    
-	    leaf yang-library-version {
-		type string {
-		    pattern '\d{4}-\d{2}-\d{2}';
-		}
-		config false;
-		mandatory true;
-		description
-		    "Identifies the revision date of the 'ietf-yang-library'
-              module that is implemented by this RESTCONF server.
-              Indicates the year, month, and day in YYYY-MM-DD
-              numeric format.";
-	    }
-	}
-    }
-
-}
diff --git a/yang/ietf-yang-types@2013-07-15.yang b/yang/ietf-yang-types@2013-07-15.yang
deleted file mode 100644
index 07834130..00000000
--- a/yang/ietf-yang-types@2013-07-15.yang
+++ /dev/null
@@ -1,481 +0,0 @@
-   module ietf-yang-types {
-
-     namespace "urn:ietf:params:xml:ns:yang:ietf-yang-types";
-     prefix "yang";
-
-     organization
-      "IETF NETMOD (NETCONF Data Modeling Language) Working Group";
-
-     contact
-      "WG Web:   <http://tools.ietf.org/wg/netmod/>
-       WG List:  <mailto:netmod@ietf.org>
-
-       WG Chair: David Kessens
-                 <mailto:david.kessens@nsn.com>
-
-       WG Chair: Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>
-
-       Editor:   Juergen Schoenwaelder
-                 <mailto:j.schoenwaelder@jacobs-university.de>";
-
-     description
-      "This module contains a collection of generally useful derived
-       YANG data types.
-
-       Copyright (c) 2013 IETF Trust and the persons identified as
-       authors of the code.  All rights reserved.
-
-       Redistribution and use in source and binary forms, with or
-       without modification, is permitted pursuant to, and subject
-       to the license terms contained in, the Simplified BSD License
-       set forth in Section 4.c of the IETF Trust's Legal Provisions
-       Relating to IETF Documents
-       (http://trustee.ietf.org/license-info).
-
-       This version of this YANG module is part of RFC 6991; see
-       the RFC itself for full legal notices.";
-
-     revision 2013-07-15 {
-       description
-        "This revision adds the following new data types:
-         - yang-identifier
-         - hex-string
-         - uuid
-         - dotted-quad";
-       reference
-        "RFC 6991: Common YANG Data Types";
-     }
-
-     revision 2010-09-24 {
-       description
-        "Initial revision.";
-       reference
-        "RFC 6021: Common YANG Data Types";
-     }
-
-     /*** collection of counter and gauge types ***/
-
-     typedef counter32 {
-       type uint32;
-       description
-        "The counter32 type represents a non-negative integer
-         that monotonically increases until it reaches a
-         maximum value of 2^32-1 (4294967295 decimal), when it
-         wraps around and starts increasing again from zero.
-
-         Counters have no defined 'initial' value, and thus, a
-         single value of a counter has (in general) no information
-         content.  Discontinuities in the monotonically increasing
-         value normally occur at re-initialization of the
-         management system, and at other times as specified in the
-         description of a schema node using this type.  If such
-         other times can occur, for example, the creation of
-         a schema node of type counter32 at times other than
-         re-initialization, then a corresponding schema node
-         should be defined, with an appropriate type, to indicate
-         the last discontinuity.
-
-         The counter32 type should not be used for configuration
-         schema nodes.  A default statement SHOULD NOT be used in
-         combination with the type counter32.
-
-         In the value set and its semantics, this type is equivalent
-         to the Counter32 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef zero-based-counter32 {
-       type yang:counter32;
-       default "0";
-       description
-        "The zero-based-counter32 type represents a counter32
-         that has the defined 'initial' value zero.
-
-         A schema node of this type will be set to zero (0) on creation
-         and will thereafter increase monotonically until it reaches
-         a maximum value of 2^32-1 (4294967295 decimal), when it
-         wraps around and starts increasing again from zero.
-
-         Provided that an application discovers a new schema node
-         of this type within the minimum time to wrap, it can use the
-         'initial' value as a delta.  It is important for a management
-         station to be aware of this minimum time and the actual time
-         between polls, and to discard data if the actual time is too
-         long or there is no defined minimum time.
-
-         In the value set and its semantics, this type is equivalent
-         to the ZeroBasedCounter32 textual convention of the SMIv2.";
-       reference
-         "RFC 4502: Remote Network Monitoring Management Information
-                    Base Version 2";
-     }
-
-     typedef counter64 {
-       type uint64;
-       description
-        "The counter64 type represents a non-negative integer
-         that monotonically increases until it reaches a
-         maximum value of 2^64-1 (18446744073709551615 decimal),
-         when it wraps around and starts increasing again from zero.
-
-         Counters have no defined 'initial' value, and thus, a
-         single value of a counter has (in general) no information
-         content.  Discontinuities in the monotonically increasing
-         value normally occur at re-initialization of the
-         management system, and at other times as specified in the
-         description of a schema node using this type.  If such
-         other times can occur, for example, the creation of
-         a schema node of type counter64 at times other than
-         re-initialization, then a corresponding schema node
-         should be defined, with an appropriate type, to indicate
-         the last discontinuity.
-
-         The counter64 type should not be used for configuration
-         schema nodes.  A default statement SHOULD NOT be used in
-         combination with the type counter64.
-
-         In the value set and its semantics, this type is equivalent
-         to the Counter64 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef zero-based-counter64 {
-       type yang:counter64;
-       default "0";
-       description
-        "The zero-based-counter64 type represents a counter64 that
-         has the defined 'initial' value zero.
-
-
-
-
-         A schema node of this type will be set to zero (0) on creation
-         and will thereafter increase monotonically until it reaches
-         a maximum value of 2^64-1 (18446744073709551615 decimal),
-         when it wraps around and starts increasing again from zero.
-
-         Provided that an application discovers a new schema node
-         of this type within the minimum time to wrap, it can use the
-         'initial' value as a delta.  It is important for a management
-         station to be aware of this minimum time and the actual time
-         between polls, and to discard data if the actual time is too
-         long or there is no defined minimum time.
-
-         In the value set and its semantics, this type is equivalent
-         to the ZeroBasedCounter64 textual convention of the SMIv2.";
-       reference
-        "RFC 2856: Textual Conventions for Additional High Capacity
-                   Data Types";
-     }
-
-     typedef gauge32 {
-       type uint32;
-       description
-        "The gauge32 type represents a non-negative integer, which
-         may increase or decrease, but shall never exceed a maximum
-         value, nor fall below a minimum value.  The maximum value
-         cannot be greater than 2^32-1 (4294967295 decimal), and
-         the minimum value cannot be smaller than 0.  The value of
-         a gauge32 has its maximum value whenever the information
-         being modeled is greater than or equal to its maximum
-         value, and has its minimum value whenever the information
-         being modeled is smaller than or equal to its minimum value.
-         If the information being modeled subsequently decreases
-         below (increases above) the maximum (minimum) value, the
-         gauge32 also decreases (increases).
-
-         In the value set and its semantics, this type is equivalent
-         to the Gauge32 type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef gauge64 {
-       type uint64;
-       description
-        "The gauge64 type represents a non-negative integer, which
-         may increase or decrease, but shall never exceed a maximum
-         value, nor fall below a minimum value.  The maximum value
-         cannot be greater than 2^64-1 (18446744073709551615), and
-         the minimum value cannot be smaller than 0.  The value of
-         a gauge64 has its maximum value whenever the information
-         being modeled is greater than or equal to its maximum
-         value, and has its minimum value whenever the information
-         being modeled is smaller than or equal to its minimum value.
-         If the information being modeled subsequently decreases
-         below (increases above) the maximum (minimum) value, the
-         gauge64 also decreases (increases).
-
-         In the value set and its semantics, this type is equivalent
-         to the CounterBasedGauge64 SMIv2 textual convention defined
-         in RFC 2856";
-       reference
-        "RFC 2856: Textual Conventions for Additional High Capacity
-                   Data Types";
-     }
-
-     /*** collection of identifier-related types ***/
-
-     typedef object-identifier {
-       type string {
-         pattern '(([0-1](\.[1-3]?[0-9]))|(2\.(0|([1-9]\d*))))'
-               + '(\.(0|([1-9]\d*)))*';
-       }
-       description
-        "The object-identifier type represents administratively
-         assigned names in a registration-hierarchical-name tree.
-
-         Values of this type are denoted as a sequence of numerical
-         non-negative sub-identifier values.  Each sub-identifier
-         value MUST NOT exceed 2^32-1 (4294967295).  Sub-identifiers
-         are separated by single dots and without any intermediate
-         whitespace.
-
-         The ASN.1 standard restricts the value space of the first
-         sub-identifier to 0, 1, or 2.  Furthermore, the value space
-         of the second sub-identifier is restricted to the range
-         0 to 39 if the first sub-identifier is 0 or 1.  Finally,
-         the ASN.1 standard requires that an object identifier
-         has always at least two sub-identifiers.  The pattern
-         captures these restrictions.
-
-         Although the number of sub-identifiers is not limited,
-         module designers should realize that there may be
-         implementations that stick with the SMIv2 limit of 128
-         sub-identifiers.
-
-         This type is a superset of the SMIv2 OBJECT IDENTIFIER type
-         since it is not restricted to 128 sub-identifiers.  Hence,
-         this type SHOULD NOT be used to represent the SMIv2 OBJECT
-         IDENTIFIER type; the object-identifier-128 type SHOULD be
-         used instead.";
-       reference
-        "ISO9834-1: Information technology -- Open Systems
-         Interconnection -- Procedures for the operation of OSI
-         Registration Authorities: General procedures and top
-         arcs of the ASN.1 Object Identifier tree";
-     }
-
-     typedef object-identifier-128 {
-       type object-identifier {
-         pattern '\d*(\.\d*){1,127}';
-       }
-       description
-        "This type represents object-identifiers restricted to 128
-         sub-identifiers.
-
-         In the value set and its semantics, this type is equivalent
-         to the OBJECT IDENTIFIER type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef yang-identifier {
-       type string {
-         length "1..max";
-         pattern '[a-zA-Z_][a-zA-Z0-9\-_.]*';
-         pattern '.|..|[^xX].*|.[^mM].*|..[^lL].*';
-       }
-       description
-         "A YANG identifier string as defined by the 'identifier'
-          rule in Section 12 of RFC 6020.  An identifier must
-          start with an alphabetic character or an underscore
-          followed by an arbitrary sequence of alphabetic or
-          numeric characters, underscores, hyphens, or dots.
-
-          A YANG identifier MUST NOT start with any possible
-          combination of the lowercase or uppercase character
-          sequence 'xml'.";
-       reference
-         "RFC 6020: YANG - A Data Modeling Language for the Network
-                    Configuration Protocol (NETCONF)";
-     }
-
-     /*** collection of types related to date and time***/
-
-     typedef date-and-time {
-       type string {
-         pattern '\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?'
-               + '(Z|[\+\-]\d{2}:\d{2})';
-       }
-       description
-        "The date-and-time type is a profile of the ISO 8601
-         standard for representation of dates and times using the
-         Gregorian calendar.  The profile is defined by the
-         date-time production in Section 5.6 of RFC 3339.
-
-         The date-and-time type is compatible with the dateTime XML
-         schema type with the following notable exceptions:
-
-         (a) The date-and-time type does not allow negative years.
-
-         (b) The date-and-time time-offset -00:00 indicates an unknown
-             time zone (see RFC 3339) while -00:00 and +00:00 and Z
-             all represent the same time zone in dateTime.
-
-         (c) The canonical format (see below) of data-and-time values
-             differs from the canonical format used by the dateTime XML
-             schema type, which requires all times to be in UTC using
-             the time-offset 'Z'.
-
-         This type is not equivalent to the DateAndTime textual
-         convention of the SMIv2 since RFC 3339 uses a different
-         separator between full-date and full-time and provides
-         higher resolution of time-secfrac.
-
-         The canonical format for date-and-time values with a known time
-         zone uses a numeric time zone offset that is calculated using
-         the device's configured known offset to UTC time.  A change of
-         the device's offset to UTC time will cause date-and-time values
-         to change accordingly.  Such changes might happen periodically
-         in case a server follows automatically daylight saving time
-         (DST) time zone offset changes.  The canonical format for
-         date-and-time values with an unknown time zone (usually
-         referring to the notion of local time) uses the time-offset
-         -00:00.";
-       reference
-        "RFC 3339: Date and Time on the Internet: Timestamps
-         RFC 2579: Textual Conventions for SMIv2
-         XSD-TYPES: XML Schema Part 2: Datatypes Second Edition";
-     }
-
-     typedef timeticks {
-       type uint32;
-       description
-        "The timeticks type represents a non-negative integer that
-         represents the time, modulo 2^32 (4294967296 decimal), in
-         hundredths of a second between two epochs.  When a schema
-         node is defined that uses this type, the description of
-         the schema node identifies both of the reference epochs.
-
-         In the value set and its semantics, this type is equivalent
-         to the TimeTicks type of the SMIv2.";
-       reference
-        "RFC 2578: Structure of Management Information Version 2
-                   (SMIv2)";
-     }
-
-     typedef timestamp {
-       type yang:timeticks;
-       description
-        "The timestamp type represents the value of an associated
-         timeticks schema node at which a specific occurrence
-         happened.  The specific occurrence must be defined in the
-         description of any schema node defined using this type.  When
-         the specific occurrence occurred prior to the last time the
-         associated timeticks attribute was zero, then the timestamp
-         value is zero.  Note that this requires all timestamp values
-         to be reset to zero when the value of the associated timeticks
-         attribute reaches 497+ days and wraps around to zero.
-
-         The associated timeticks schema node must be specified
-         in the description of any schema node using this type.
-
-         In the value set and its semantics, this type is equivalent
-         to the TimeStamp textual convention of the SMIv2.";
-       reference
-        "RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     /*** collection of generic address types ***/
-
-     typedef phys-address {
-       type string {
-         pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-       }
-
-
-
-
-       description
-        "Represents media- or physical-level addresses represented
-         as a sequence octets, each octet represented by two hexadecimal
-         numbers.  Octets are separated by colons.  The canonical
-         representation uses lowercase characters.
-
-         In the value set and its semantics, this type is equivalent
-         to the PhysAddress textual convention of the SMIv2.";
-       reference
-        "RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     typedef mac-address {
-       type string {
-         pattern '[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}';
-       }
-       description
-        "The mac-address type represents an IEEE 802 MAC address.
-         The canonical representation uses lowercase characters.
-
-         In the value set and its semantics, this type is equivalent
-         to the MacAddress textual convention of the SMIv2.";
-       reference
-        "IEEE 802: IEEE Standard for Local and Metropolitan Area
-                   Networks: Overview and Architecture
-         RFC 2579: Textual Conventions for SMIv2";
-     }
-
-     /*** collection of XML-specific types ***/
-
-     typedef xpath1.0 {
-       type string;
-       description
-        "This type represents an XPATH 1.0 expression.
-
-         When a schema node is defined that uses this type, the
-         description of the schema node MUST specify the XPath
-         context in which the XPath expression is evaluated.";
-       reference
-        "XPATH: XML Path Language (XPath) Version 1.0";
-     }
-
-     /*** collection of string types ***/
-
-     typedef hex-string {
-       type string {
-         pattern '([0-9a-fA-F]{2}(:[0-9a-fA-F]{2})*)?';
-       }
-       description
-        "A hexadecimal string with octets represented as hex digits
-         separated by colons.  The canonical representation uses
-         lowercase characters.";
-     }
-
-     typedef uuid {
-       type string {
-         pattern '[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-'
-               + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12}';
-       }
-       description
-        "A Universally Unique IDentifier in the string representation
-         defined in RFC 4122.  The canonical representation uses
-         lowercase characters.
-
-         The following is an example of a UUID in string representation:
-         f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-         ";
-       reference
-        "RFC 4122: A Universally Unique IDentifier (UUID) URN
-                   Namespace";
-     }
-
-     typedef dotted-quad {
-       type string {
-         pattern
-           '(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}'
-         + '([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
-       }
-       description
-         "An unsigned 32-bit number expressed in the dotted-quad
-          notation, i.e., four octets written as decimal numbers
-          and separated with the '.' (full stop) character.";
-     }
-   }
-
diff --git a/yang/standard/Makefile.in b/yang/standard/Makefile.in
new file mode 100644
index 00000000..6da576ae
--- /dev/null
+++ b/yang/standard/Makefile.in
@@ -0,0 +1,76 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# 
+# Copyright (C) 2009-2019 Olof Hagsand and Benny Holmgren
+#
+# This file is part of CLIXON
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# the GNU General Public License Version 3 or later (the "GPL"),
+# in which case the provisions of the GPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of the GPL, and not to allow others to
+# use your version of this file under the terms of Apache License version 2, 
+# indicate your decision by deleting the provisions above and replace them with
+# the notice and other provisions required by the GPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the Apache License version 2 or the GPL.
+#
+# ***** END LICENSE BLOCK *****
+#
+VPATH       	= @srcdir@
+srcdir  	= @srcdir@
+top_srcdir  	= @top_srcdir@
+prefix 		= @prefix@
+bindir 		= @bindir@
+includedir	= @includedir@
+datarootdir     = @datarootdir@
+
+# Could place them in separate standards dir?
+CLIXON_DATADIR   = @CLIXON_DATADIR@
+
+YANGSPECS  = iana-if-type@2014-05-08.yang
+YANGSPECS += ietf-interfaces@2018-02-20.yang
+YANGSPECS += ietf-yang-types@2013-07-15.yang
+YANGSPECS += ietf-ip@2014-06-16.yang
+YANGSPECS += ietf-inet-types@2013-07-15.yang
+YANGSPECS += ietf-routing@2018-03-13.yang
+YANGSPECS += ietf-yang-library@2016-06-21.yang
+YANGSPECS += ietf-netconf@2011-06-01.yang
+YANGSPECS += ietf-netconf-acm@2018-02-14.yang
+YANGSPECS += ietf-restconf-monitoring@2017-01-26.yang
+YANGSPECS += ietf-netconf-monitoring@2010-10-04.yang
+
+all:	
+
+clean:
+
+distclean: clean
+	rm -f Makefile *~ .depend
+
+install: $(YANGSPECS) 
+	install -d -m 0755 $(DESTDIR)$(CLIXON_DATADIR)
+	install -m 0644 $(YANGSPECS) $(DESTDIR)$(CLIXON_DATADIR)
+
+uninstall:
+	(cd $(DESTDIR)$(CLIXON_DATADIR); rm -rf *.yang)
+
+install-include:	
+
+depend:
+
+
+#include .depend
+
diff --git a/example/iana-if-type@2014-05-08.yang b/yang/standard/iana-if-type@2014-05-08.yang
similarity index 100%
rename from example/iana-if-type@2014-05-08.yang
rename to yang/standard/iana-if-type@2014-05-08.yang
diff --git a/example/ietf-inet-types@2013-07-15.yang b/yang/standard/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from example/ietf-inet-types@2013-07-15.yang
rename to yang/standard/ietf-inet-types@2013-07-15.yang
diff --git a/yang/standard/ietf-interfaces@2018-02-20.yang b/yang/standard/ietf-interfaces@2018-02-20.yang
new file mode 100644
index 00000000..f66c205c
--- /dev/null
+++ b/yang/standard/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1,1123 @@
+module ietf-interfaces {
+  yang-version 1.1;
+  namespace "urn:ietf:params:xml:ns:yang:ietf-interfaces";
+  prefix if;
+
+  import ietf-yang-types {
+    prefix yang;
+  }
+
+  organization
+    "IETF NETMOD (Network Modeling) Working Group";
+
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+     WG List:  <mailto:netmod@ietf.org>
+
+     Editor:   Martin Bjorklund
+               <mailto:mbj@tail-f.com>";
+
+  description
+    "This module contains a collection of YANG definitions for
+     managing network interfaces.
+
+     Copyright (c) 2018 IETF Trust and the persons identified as
+     authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (https://trustee.ietf.org/license-info).
+
+     This version of this YANG module is part of RFC 8343; see
+     the RFC itself for full legal notices.";
+
+  revision 2018-02-20 {
+    description
+      "Updated to support NMDA.";
+    reference
+      "RFC 8343: A YANG Data Model for Interface Management";
+  }
+
+  revision 2014-05-08 {
+    description
+      "Initial revision.";
+    reference
+      "RFC 7223: A YANG Data Model for Interface Management";
+  }
+
+  /*
+   * Typedefs
+   */
+
+  typedef interface-ref {
+    type leafref {
+      path "/if:interfaces/if:interface/if:name";
+    }
+    description
+      "This type is used by data models that need to reference
+       interfaces.";
+  }
+
+  /*
+   * Identities
+   */
+
+  identity interface-type {
+    description
+      "Base identity from which specific interface types are
+       derived.";
+  }
+
+  /*
+   * Features
+   */
+
+  feature arbitrary-names {
+    description
+      "This feature indicates that the device allows user-controlled
+       interfaces to be named arbitrarily.";
+  }
+  feature pre-provisioning {
+    description
+      "This feature indicates that the device supports
+       pre-provisioning of interface configuration, i.e., it is
+       possible to configure an interface whose physical interface
+       hardware is not present on the device.";
+  }
+  feature if-mib {
+    description
+      "This feature indicates that the device implements
+       the IF-MIB.";
+    reference
+      "RFC 2863: The Interfaces Group MIB";
+  }
+
+  /*
+   * Data nodes
+   */
+
+  container interfaces {
+    description
+      "Interface parameters.";
+
+    list interface {
+      key "name";
+
+      description
+        "The list of interfaces on the device.
+
+         The status of an interface is available in this list in the
+         operational state.  If the configuration of a
+         system-controlled interface cannot be used by the system
+         (e.g., the interface hardware present does not match the
+         interface type), then the configuration is not applied to
+         the system-controlled interface shown in the operational
+         state.  If the configuration of a user-controlled interface
+         cannot be used by the system, the configured interface is
+         not instantiated in the operational state.
+
+         System-controlled interfaces created by the system are
+         always present in this list in the operational state,
+         whether or not they are configured.";
+
+     leaf name {
+        type string;
+        description
+          "The name of the interface.
+
+           A device MAY restrict the allowed values for this leaf,
+           possibly depending on the type of the interface.
+           For system-controlled interfaces, this leaf is the
+           device-specific name of the interface.
+
+           If a client tries to create configuration for a
+           system-controlled interface that is not present in the
+           operational state, the server MAY reject the request if
+           the implementation does not support pre-provisioning of
+           interfaces or if the name refers to an interface that can
+           never exist in the system.  A Network Configuration
+           Protocol (NETCONF) server MUST reply with an rpc-error
+           with the error-tag 'invalid-value' in this case.
+
+           If the device supports pre-provisioning of interface
+           configuration, the 'pre-provisioning' feature is
+           advertised.
+
+           If the device allows arbitrarily named user-controlled
+           interfaces, the 'arbitrary-names' feature is advertised.
+
+           When a configured user-controlled interface is created by
+           the system, it is instantiated with the same name in the
+           operational state.
+
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf description {
+        type string;
+        description
+          "A textual description of the interface.
+
+           A server implementation MAY map this leaf to the ifAlias
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifAlias.  The definition of
+           such a mechanism is outside the scope of this document.
+
+           Since ifAlias is defined to be stored in non-volatile
+           storage, the MIB implementation MUST map ifAlias to the
+           value of 'description' in the persistently stored
+           configuration.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAlias";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        description
+          "The type of the interface.
+
+           When an interface entry is created, a server MAY
+           initialize the type leaf with a valid value, e.g., if it
+           is possible to derive the type from the name of the
+           interface.
+
+           If a client tries to set the type of an interface to a
+           value that can never be used by the system, e.g., if the
+           type is not supported or if the type does not match the
+           name of the interface, the server MUST reject the request.
+           A NETCONF server MUST reply with an rpc-error with the
+           error-tag 'invalid-value' in this case.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf enabled {
+        type boolean;
+        default "true";
+        description
+          "This leaf contains the configured, desired state of the
+           interface.
+
+           Systems that implement the IF-MIB use the value of this
+           leaf in the intended configuration to set
+           IF-MIB.ifAdminStatus to 'up' or 'down' after an ifEntry
+           has been initialized, as described in RFC 2863.
+
+           Changes in this leaf in the intended configuration are
+           reflected in ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf link-up-down-trap-enable {
+        if-feature if-mib;
+        type enumeration {
+          enum enabled {
+            value 1;
+            description
+              "The device will generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+          enum disabled {
+            value 2;
+            description
+              "The device will not generate linkUp/linkDown SNMP
+               notifications for this interface.";
+          }
+        }
+        description
+          "Controls whether linkUp/linkDown SNMP notifications
+           should be generated for this interface.
+
+           If this node is not configured, the value 'enabled' is
+           operationally used by the server for interfaces that do
+           not operate on top of any other interface (i.e., there are
+           no 'lower-layer-if' entries), and 'disabled' otherwise.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifLinkUpDownTrapEnable";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The desired state of the interface.
+
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        config false;
+        mandatory true;
+        description
+          "The current operational state of the interface.
+
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        config false;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        config false;
+        mandatory true;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        config false;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-ref;
+        config false;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-ref;
+        config false;
+
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        config false;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        config false;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+
+    }
+  }
+
+  /*
+   * Legacy typedefs
+   */
+
+  typedef interface-state-ref {
+    type leafref {
+      path "/if:interfaces-state/if:interface/if:name";
+    }
+    status deprecated;
+    description
+      "This type is used by data models that need to reference
+       the operationally present interfaces.";
+  }
+
+  /*
+   * Legacy operational state data nodes
+   */
+
+  container interfaces-state {
+    config false;
+    status deprecated;
+    description
+      "Data nodes for the operational state of interfaces.";
+
+    list interface {
+      key "name";
+      status deprecated;
+
+      description
+        "The list of interfaces on the device.
+
+         System-controlled interfaces created by the system are
+         always present in this list, whether or not they are
+         configured.";
+
+      leaf name {
+        type string;
+        status deprecated;
+        description
+          "The name of the interface.
+
+           A server implementation MAY map this leaf to the ifName
+           MIB object.  Such an implementation needs to use some
+           mechanism to handle the differences in size and characters
+           allowed between this leaf and ifName.  The definition of
+           such a mechanism is outside the scope of this document.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifName";
+      }
+
+      leaf type {
+        type identityref {
+          base interface-type;
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The type of the interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifType";
+      }
+
+      leaf admin-status {
+        if-feature if-mib;
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "Not ready to pass packets and not in some test mode.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The desired state of the interface.
+
+           This leaf has the same read semantics as ifAdminStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifAdminStatus";
+      }
+
+      leaf oper-status {
+        type enumeration {
+          enum up {
+            value 1;
+            description
+              "Ready to pass packets.";
+          }
+          enum down {
+            value 2;
+            description
+              "The interface does not pass any packets.";
+          }
+          enum testing {
+            value 3;
+            description
+              "In some test mode.  No operational packets can
+               be passed.";
+          }
+          enum unknown {
+            value 4;
+            description
+              "Status cannot be determined for some reason.";
+          }
+          enum dormant {
+            value 5;
+            description
+              "Waiting for some external event.";
+          }
+          enum not-present {
+            value 6;
+            description
+              "Some component (typically hardware) is missing.";
+          }
+          enum lower-layer-down {
+            value 7;
+            description
+              "Down due to state of lower-layer interface(s).";
+          }
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The current operational state of the interface.
+
+           This leaf has the same semantics as ifOperStatus.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifOperStatus";
+      }
+
+      leaf last-change {
+        type yang:date-and-time;
+        status deprecated;
+        description
+          "The time the interface entered its current operational
+           state.  If the current state was entered prior to the
+           last re-initialization of the local network management
+           subsystem, then this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifLastChange";
+      }
+
+      leaf if-index {
+        if-feature if-mib;
+        type int32 {
+          range "1..2147483647";
+        }
+        mandatory true;
+        status deprecated;
+        description
+          "The ifIndex value for the ifEntry represented by this
+           interface.";
+
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifIndex";
+      }
+
+      leaf phys-address {
+        type yang:phys-address;
+        status deprecated;
+        description
+          "The interface's address at its protocol sub-layer.  For
+           example, for an 802.x interface, this object normally
+           contains a Media Access Control (MAC) address.  The
+           interface's media-specific modules must define the bit
+           and byte ordering and the format of the value of this
+           object.  For interfaces that do not have such an address
+           (e.g., a serial line), this node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifPhysAddress";
+      }
+
+      leaf-list higher-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered on top of this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf-list lower-layer-if {
+        type interface-state-ref;
+        status deprecated;
+        description
+          "A list of references to interfaces layered underneath this
+           interface.";
+        reference
+          "RFC 2863: The Interfaces Group MIB - ifStackTable";
+      }
+
+      leaf speed {
+        type yang:gauge64;
+        units "bits/second";
+        status deprecated;
+        description
+            "An estimate of the interface's current bandwidth in bits
+             per second.  For interfaces that do not vary in
+             bandwidth or for those where no accurate estimation can
+
+             be made, this node should contain the nominal bandwidth.
+             For interfaces that have no concept of bandwidth, this
+             node is not present.";
+        reference
+          "RFC 2863: The Interfaces Group MIB -
+                     ifSpeed, ifHighSpeed";
+      }
+
+      container statistics {
+        status deprecated;
+        description
+          "A collection of interface-related statistics objects.";
+
+        leaf discontinuity-time {
+          type yang:date-and-time;
+          mandatory true;
+          status deprecated;
+          description
+            "The time on the most recent occasion at which any one or
+             more of this interface's counters suffered a
+             discontinuity.  If no such discontinuities have occurred
+             since the last re-initialization of the local management
+             subsystem, then this node contains the time the local
+             management subsystem re-initialized itself.";
+        }
+
+        leaf in-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets received on the interface,
+             including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInOctets";
+        }
+
+        leaf in-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were not addressed to a
+             multicast or broadcast address at this sub-layer.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCInUcastPkts";
+        }
+
+        leaf in-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a broadcast
+             address at this sub-layer.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInBroadcastPkts";
+        }
+
+        leaf in-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The number of packets, delivered by this sub-layer to a
+             higher (sub-)layer, that were addressed to a multicast
+             address at this sub-layer.  For a MAC-layer protocol,
+             this includes both Group and Functional addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCInMulticastPkts";
+        }
+
+        leaf in-discards {
+          type yang:counter32;
+          status deprecated;
+
+          description
+            "The number of inbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being deliverable to a higher-layer
+             protocol.  One possible reason for discarding such a
+             packet could be to free up buffer space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInDiscards";
+        }
+
+        leaf in-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of inbound
+             packets that contained errors preventing them from being
+             deliverable to a higher-layer protocol.  For character-
+             oriented or fixed-length interfaces, the number of
+             inbound transmission units that contained errors
+             preventing them from being deliverable to a higher-layer
+             protocol.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInErrors";
+        }
+
+        leaf in-unknown-protos {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of packets
+             received via the interface that were discarded because
+             of an unknown or unsupported protocol.  For
+             character-oriented or fixed-length interfaces that
+             support protocol multiplexing, the number of
+             transmission units received via the interface that were
+             discarded because of an unknown or unsupported protocol.
+             For any interface that does not support protocol
+             multiplexing, this counter is not present.
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifInUnknownProtos";
+        }
+
+        leaf out-octets {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of octets transmitted out of the
+             interface, including framing characters.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutOctets";
+        }
+
+        leaf out-unicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were not addressed
+             to a multicast or broadcast address at this sub-layer,
+             including those that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifHCOutUcastPkts";
+        }
+
+        leaf out-broadcast-pkts {
+          type yang:counter64;
+          status deprecated;
+
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             broadcast address at this sub-layer, including those
+             that were discarded or not sent.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutBroadcastPkts";
+        }
+
+        leaf out-multicast-pkts {
+          type yang:counter64;
+          status deprecated;
+          description
+            "The total number of packets that higher-level protocols
+             requested be transmitted and that were addressed to a
+             multicast address at this sub-layer, including those
+             that were discarded or not sent.  For a MAC-layer
+             protocol, this includes both Group and Functional
+             addresses.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB -
+                       ifHCOutMulticastPkts";
+        }
+
+        leaf out-discards {
+          type yang:counter32;
+          status deprecated;
+          description
+            "The number of outbound packets that were chosen to be
+             discarded even though no errors had been detected to
+             prevent their being transmitted.  One possible reason
+             for discarding such a packet could be to free up buffer
+             space.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutDiscards";
+        }
+
+        leaf out-errors {
+          type yang:counter32;
+          status deprecated;
+          description
+            "For packet-oriented interfaces, the number of outbound
+             packets that could not be transmitted because of errors.
+             For character-oriented or fixed-length interfaces, the
+             number of outbound transmission units that could not be
+             transmitted because of errors.
+
+             Discontinuities in the value of this counter can occur
+             at re-initialization of the management system and at
+             other times as indicated by the value of
+             'discontinuity-time'.";
+          reference
+            "RFC 2863: The Interfaces Group MIB - ifOutErrors";
+        }
+      }
+    }
+  }
+}
diff --git a/example/ietf-ip@2014-06-16.yang b/yang/standard/ietf-ip@2014-06-16.yang
similarity index 100%
rename from example/ietf-ip@2014-06-16.yang
rename to yang/standard/ietf-ip@2014-06-16.yang
diff --git a/yang/ietf-netconf-acm@2018-02-14.yang b/yang/standard/ietf-netconf-acm@2018-02-14.yang
similarity index 100%
rename from yang/ietf-netconf-acm@2018-02-14.yang
rename to yang/standard/ietf-netconf-acm@2018-02-14.yang
diff --git a/yang/ietf-netconf-monitoring@2010-10-04.yang b/yang/standard/ietf-netconf-monitoring@2010-10-04.yang
similarity index 100%
rename from yang/ietf-netconf-monitoring@2010-10-04.yang
rename to yang/standard/ietf-netconf-monitoring@2010-10-04.yang
diff --git a/yang/ietf-netconf@2011-06-01.yang b/yang/standard/ietf-netconf@2011-06-01.yang
similarity index 100%
rename from yang/ietf-netconf@2011-06-01.yang
rename to yang/standard/ietf-netconf@2011-06-01.yang
diff --git a/yang/ietf-restconf-monitoring@2017-01-26.yang b/yang/standard/ietf-restconf-monitoring@2017-01-26.yang
similarity index 100%
rename from yang/ietf-restconf-monitoring@2017-01-26.yang
rename to yang/standard/ietf-restconf-monitoring@2017-01-26.yang
diff --git a/yang/standard/ietf-routing@2018-03-13.yang b/yang/standard/ietf-routing@2018-03-13.yang
new file mode 100644
index 00000000..9e259f0e
--- /dev/null
+++ b/yang/standard/ietf-routing@2018-03-13.yang
@@ -0,0 +1,684 @@
+module ietf-routing {
+  yang-version "1.1";
+  namespace "urn:ietf:params:xml:ns:yang:ietf-routing";
+  prefix "rt";
+
+  import ietf-yang-types {
+    prefix "yang";
+  }
+
+  import ietf-interfaces {
+    prefix "if";
+    description
+      "An 'ietf-interfaces' module version that is compatible with
+       the Network Management Datastore Architecture (NMDA)
+       is required.";
+  }
+
+  organization
+    "IETF NETMOD (Network Modeling) Working Group";
+  contact
+    "WG Web:   <https://datatracker.ietf.org/wg/netmod/>
+     WG List:  <mailto:rtgwg@ietf.org>
+
+     Editor:   Ladislav Lhotka
+               <mailto:lhotka@nic.cz>
+               Acee Lindem
+               <mailto:acee@cisco.com>
+               Yingzhen Qu
+               <mailto:yingzhen.qu@huawei.com>";
+
+  description
+    "This YANG module defines essential components for the management
+     of a routing subsystem.  The model fully conforms to the Network
+     Management Datastore Architecture (NMDA).
+
+     Copyright (c) 2018 IETF Trust and the persons
+     identified as authors of the code.  All rights reserved.
+
+     Redistribution and use in source and binary forms, with or
+     without modification, is permitted pursuant to, and subject
+     to the license terms contained in, the Simplified BSD License
+     set forth in Section 4.c of the IETF Trust's Legal Provisions
+     Relating to IETF Documents
+     (https://trustee.ietf.org/license-info).
+     This version of this YANG module is part of RFC 8349; see
+     the RFC itself for full legal notices.";
+
+  revision 2018-03-13 {
+    description
+      "Network Management Datastore Architecture (NMDA) revision.";
+    reference
+      "RFC 8349: A YANG Data Model for Routing Management
+                 (NMDA Version)";
+  }
+
+  revision 2016-11-04 {
+       description
+         "Initial revision.";
+       reference
+         "RFC 8022: A YANG Data Model for Routing Management";
+  }
+
+  /* Features */
+  feature multiple-ribs {
+    description
+      "This feature indicates that the server supports
+       user-defined RIBs.
+
+       Servers that do not advertise this feature SHOULD provide
+       exactly one system-controlled RIB per supported address family
+       and also make it the default RIB.  This RIB then appears as an
+       entry in the list '/routing/ribs/rib'.";
+  }
+
+  feature router-id {
+    description
+      "This feature indicates that the server supports an explicit
+       32-bit router ID that is used by some routing protocols.
+
+       Servers that do not advertise this feature set a router ID
+       algorithmically, usually to one of the configured IPv4
+       addresses.  However, this algorithm is implementation
+       specific.";
+  }
+
+  /* Identities */
+
+  identity address-family {
+    description
+      "Base identity from which identities describing address
+       families are derived.";
+  }
+  identity ipv4 {
+    base address-family;
+    description
+      "This identity represents an IPv4 address family.";
+  }
+
+  identity ipv6 {
+    base address-family;
+    description
+      "This identity represents an IPv6 address family.";
+  }
+
+  identity control-plane-protocol {
+    description
+      "Base identity from which control-plane protocol identities are
+       derived.";
+  }
+
+  identity routing-protocol {
+    base control-plane-protocol;
+    description
+      "Identity from which Layer 3 routing protocol identities are
+       derived.";
+  }
+
+  identity direct {
+    base routing-protocol;
+    description
+      "Routing pseudo-protocol that provides routes to directly
+       connected networks.";
+  }
+
+  identity static {
+    base routing-protocol;
+    description
+      "'Static' routing pseudo-protocol.";
+  }
+
+  /* Type Definitions */
+
+  typedef route-preference {
+    type uint32;
+    description
+      "This type is used for route preferences.";
+  }
+
+  /* Groupings */
+
+  grouping address-family {
+    description
+      "This grouping provides a leaf identifying an address
+       family.";
+    leaf address-family {
+      type identityref {
+        base address-family;
+      }
+      mandatory true;
+      description
+        "Address family.";
+    }
+  }
+
+  grouping router-id {
+    description
+      "This grouping provides a router ID.";
+    leaf router-id {
+      type yang:dotted-quad;
+      description
+        "A 32-bit number in the form of a dotted quad that is used by
+         some routing protocols identifying a router.";
+      reference
+        "RFC 2328: OSPF Version 2";
+    }
+  }
+
+  grouping special-next-hop {
+    description
+      "This grouping provides a leaf with an enumeration of special
+       next hops.";
+    leaf special-next-hop {
+      type enumeration {
+        enum blackhole {
+          description
+            "Silently discard the packet.";
+        }
+        enum unreachable {
+          description
+            "Discard the packet and notify the sender with an error
+             message indicating that the destination host is
+             unreachable.";
+        }
+        enum prohibit {
+          description
+            "Discard the packet and notify the sender with an error
+             message indicating that the communication is
+             administratively prohibited.";
+        }
+        enum receive {
+          description
+            "The packet will be received by the local system.";
+        }
+      }
+      description
+        "Options for special next hops.";
+    }
+  }
+
+  grouping next-hop-content {
+    description
+      "Generic parameters of next hops in static routes.";
+    choice next-hop-options {
+      mandatory true;
+      description
+        "Options for next hops in static routes.
+
+         It is expected that further cases will be added through
+         augments from other modules.";
+      case simple-next-hop {
+        description
+          "This case represents a simple next hop consisting of the
+           next-hop address and/or outgoing interface.
+
+           Modules for address families MUST augment this case with a
+           leaf containing a next-hop address of that address
+           family.";
+        leaf outgoing-interface {
+          type if:interface-ref;
+          description
+            "Name of the outgoing interface.";
+        }
+      }
+      case special-next-hop {
+        uses special-next-hop;
+      }
+      case next-hop-list {
+        container next-hop-list {
+          description
+            "Container for multiple next hops.";
+          list next-hop {
+            key "index";
+            description
+              "An entry in a next-hop list.
+
+               Modules for address families MUST augment this list
+               with a leaf containing a next-hop address of that
+               address family.";
+            leaf index {
+              type string;
+              description
+                "A user-specified identifier utilized to uniquely
+                 reference the next-hop entry in the next-hop list.
+                 The value of this index has no semantic meaning
+                 other than for referencing the entry.";
+            }
+            leaf outgoing-interface {
+              type if:interface-ref;
+              description
+                "Name of the outgoing interface.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping next-hop-state-content {
+    description
+      "Generic state parameters of next hops.";
+    choice next-hop-options {
+      mandatory true;
+      description
+        "Options for next hops.
+
+         It is expected that further cases will be added through
+         augments from other modules, e.g., for recursive
+         next hops.";
+      case simple-next-hop {
+        description
+          "This case represents a simple next hop consisting of the
+           next-hop address and/or outgoing interface.
+
+           Modules for address families MUST augment this case with a
+           leaf containing a next-hop address of that address
+           family.";
+        leaf outgoing-interface {
+          type if:interface-ref;
+          description
+            "Name of the outgoing interface.";
+        }
+      }
+      case special-next-hop {
+        uses special-next-hop;
+      }
+      case next-hop-list {
+        container next-hop-list {
+          description
+            "Container for multiple next hops.";
+          list next-hop {
+            description
+              "An entry in a next-hop list.
+
+               Modules for address families MUST augment this list
+               with a leaf containing a next-hop address of that
+               address family.";
+            leaf outgoing-interface {
+              type if:interface-ref;
+              description
+                "Name of the outgoing interface.";
+            }
+          }
+        }
+      }
+    }
+  }
+
+  grouping route-metadata {
+    description
+      "Common route metadata.";
+    leaf source-protocol {
+      type identityref {
+        base routing-protocol;
+      }
+      mandatory true;
+      description
+        "Type of the routing protocol from which the route
+         originated.";
+    }
+    leaf active {
+      type empty;
+      description
+        "The presence of this leaf indicates that the route is
+         preferred among all routes in the same RIB that have the
+         same destination prefix.";
+    }
+    leaf last-updated {
+      type yang:date-and-time;
+      description
+        "Timestamp of the last modification of the route.  If the
+         route was never modified, it is the time when the route was
+         inserted into the RIB.";
+    }
+  }
+
+  /* Data nodes */
+
+  container routing {
+    description
+      "Configuration parameters for the routing subsystem.";
+    uses router-id {
+      if-feature "router-id";
+      description
+        "Support for the global router ID.  Routing protocols
+         that use a router ID can use this parameter or override it
+         with another value.";
+    }
+    container interfaces {
+      config false;
+      description
+        "Network-layer interfaces used for routing.";
+      leaf-list interface {
+        type if:interface-ref;
+        description
+          "Each entry is a reference to the name of a configured
+           network-layer interface.";
+      }
+    }
+    container control-plane-protocols {
+      description
+        "Support for control-plane protocol instances.";
+      list control-plane-protocol {
+        key "type name";
+        description
+          "Each entry contains a control-plane protocol instance.";
+        leaf type {
+          type identityref {
+            base control-plane-protocol;
+          }
+          description
+            "Type of the control-plane protocol -- an identity
+             derived from the 'control-plane-protocol'
+             base identity.";
+        }
+        leaf name {
+          type string;
+          description
+            "An arbitrary name of the control-plane protocol
+             instance.";
+        }
+        leaf description {
+          type string;
+          description
+            "Textual description of the control-plane protocol
+             instance.";
+        }
+        container static-routes {
+          when "derived-from-or-self(../type, 'rt:static')" {
+            description
+              "This container is only valid for the 'static' routing
+               protocol.";
+          }
+          description
+            "Support for the 'static' pseudo-protocol.
+
+             Address-family-specific modules augment this node with
+             their lists of routes.";
+        }
+      }
+    }
+    container ribs {
+      description
+        "Support for RIBs.";
+      list rib {
+        key "name";
+        description
+          "Each entry contains a configuration for a RIB identified
+           by the 'name' key.
+
+           Entries having the same key as a system-controlled entry
+           in the list '/routing/ribs/rib' are used for
+           configuring parameters of that entry.  Other entries
+           define additional user-controlled RIBs.";
+        leaf name {
+          type string;
+          description
+            "The name of the RIB.
+
+             For system-controlled entries, the value of this leaf
+             must be the same as the name of the corresponding entry
+             in the operational state.
+
+             For user-controlled entries, an arbitrary name can be
+             used.";
+        }
+        uses address-family {
+          description
+            "The address family of the system-controlled RIB.";
+        }
+
+        leaf default-rib {
+          if-feature "multiple-ribs";
+          type boolean;
+          default "true";
+          config false;
+          description
+            "This flag has the value of 'true' if and only if the RIB
+             is the default RIB for the given address family.
+
+             By default, control-plane protocols place their routes
+             in the default RIBs.";
+        }
+        container routes {
+          config false;
+          description
+            "Current contents of the RIB.";
+          list route {
+            description
+              "A RIB route entry.  This data node MUST be augmented
+               with information specific to routes of each address
+               family.";
+            leaf route-preference {
+              type route-preference;
+              description
+                "This route attribute, also known as 'administrative
+                 distance', allows for selecting the preferred route
+                 among routes with the same destination prefix.  A
+                 smaller value indicates a route that is
+                 more preferred.";
+            }
+            container next-hop {
+              description
+                "Route's next-hop attribute.";
+              uses next-hop-state-content;
+            }
+            uses route-metadata;
+          }
+        }
+        action active-route {
+          description
+            "Return the active RIB route that is used for the
+             destination address.
+
+             Address-family-specific modules MUST augment input
+             parameters with a leaf named 'destination-address'.";
+          output {
+            container route {
+              description
+                "The active RIB route for the specified destination.
+
+                 If no route exists in the RIB for the destination
+                 address, no output is returned.
+
+                 Address-family-specific modules MUST augment this
+                 container with appropriate route contents.";
+              container next-hop {
+                description
+                  "Route's next-hop attribute.";
+                uses next-hop-state-content;
+              }
+              uses route-metadata;
+            }
+          }
+        }
+        leaf description {
+          type string;
+          description
+            "Textual description of the RIB.";
+        }
+      }
+    }
+  }
+
+  /*
+   * The subsequent data nodes are obviated and obsoleted
+   * by the Network Management Datastore Architecture
+   * as described in RFC 8342.
+   */
+  container routing-state {
+    config false;
+    status obsolete;
+    description
+      "State data of the routing subsystem.";
+    uses router-id {
+      status obsolete;
+      description
+        "Global router ID.
+
+         It may be either configured or assigned algorithmically by
+         the implementation.";
+    }
+    container interfaces {
+      status obsolete;
+      description
+        "Network-layer interfaces used for routing.";
+      leaf-list interface {
+        type if:interface-state-ref;
+        status obsolete;
+        description
+          "Each entry is a reference to the name of a configured
+           network-layer interface.";
+      }
+    }
+    container control-plane-protocols {
+      status obsolete;
+      description
+        "Container for the list of routing protocol instances.";
+      list control-plane-protocol {
+        key "type name";
+        status obsolete;
+        description
+          "State data of a control-plane protocol instance.
+
+           An implementation MUST provide exactly one
+           system-controlled instance of the 'direct'
+           pseudo-protocol.  Instances of other control-plane
+           protocols MAY be created by configuration.";
+        leaf type {
+          type identityref {
+            base control-plane-protocol;
+          }
+          status obsolete;
+          description
+            "Type of the control-plane protocol.";
+        }
+        leaf name {
+          type string;
+          status obsolete;
+          description
+            "The name of the control-plane protocol instance.
+
+             For system-controlled instances, this name is
+             persistent, i.e., it SHOULD NOT change across
+             reboots.";
+        }
+      }
+    }
+    container ribs {
+      status obsolete;
+      description
+        "Container for RIBs.";
+      list rib {
+        key "name";
+        min-elements 1;
+        status obsolete;
+        description
+          "Each entry represents a RIB identified by the 'name'
+           key.  All routes in a RIB MUST belong to the same address
+           family.
+
+           An implementation SHOULD provide one system-controlled
+           default RIB for each supported address family.";
+        leaf name {
+          type string;
+          status obsolete;
+          description
+            "The name of the RIB.";
+        }
+        uses address-family {
+          status obsolete;
+          description
+            "The address family of the RIB.";
+        }
+        leaf default-rib {
+          if-feature "multiple-ribs";
+          type boolean;
+          default "true";
+          status obsolete;
+          description
+            "This flag has the value of 'true' if and only if the
+             RIB is the default RIB for the given address family.
+
+             By default, control-plane protocols place their routes
+             in the default RIBs.";
+        }
+        container routes {
+          status obsolete;
+          description
+            "Current contents of the RIB.";
+          list route {
+            status obsolete;
+            description
+              "A RIB route entry.  This data node MUST be augmented
+               with information specific to routes of each address
+               family.";
+            leaf route-preference {
+              type route-preference;
+              status obsolete;
+              description
+                "This route attribute, also known as 'administrative
+                 distance', allows for selecting the preferred route
+                 among routes with the same destination prefix.  A
+                 smaller value indicates a route that is
+                 more preferred.";
+            }
+            container next-hop {
+              status obsolete;
+              description
+                "Route's next-hop attribute.";
+              uses next-hop-state-content {
+                status obsolete;
+                description
+                  "Route's next-hop attribute operational state.";
+              }
+            }
+            uses route-metadata {
+              status obsolete;
+              description
+                "Route metadata.";
+            }
+          }
+        }
+        action active-route {
+          status obsolete;
+          description
+            "Return the active RIB route that is used for the
+             destination address.
+
+             Address-family-specific modules MUST augment input
+             parameters with a leaf named 'destination-address'.";
+          output {
+            container route {
+              status obsolete;
+              description
+                "The active RIB route for the specified
+                 destination.
+
+                 If no route exists in the RIB for the destination
+                 address, no output is returned.
+
+                 Address-family-specific modules MUST augment this
+                 container with appropriate route contents.";
+              container next-hop {
+                status obsolete;
+                description
+                  "Route's next-hop attribute.";
+                uses next-hop-state-content {
+                  status obsolete;
+                  description
+                    "Active route state data.";
+                }
+              }
+              uses route-metadata {
+                status obsolete;
+                description
+                  "Active route metadata.";
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/yang/ietf-yang-library@2016-06-21.yang b/yang/standard/ietf-yang-library@2016-06-21.yang
similarity index 100%
rename from yang/ietf-yang-library@2016-06-21.yang
rename to yang/standard/ietf-yang-library@2016-06-21.yang
diff --git a/example/ietf-yang-types@2013-07-15.yang b/yang/standard/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from example/ietf-yang-types@2013-07-15.yang
rename to yang/standard/ietf-yang-types@2013-07-15.yang