124 files changed, 230 insertions, 342 deletions

diff --git a/README.md b/README.md
index b843f93..a69441b 100644
--- a/README.md
+++ b/README.md
@@ -58,11 +58,17 @@ By default symbolic links to headers in bundles are installed to `INCLUDEDIR`.
 If symbolic links are a problem, configure with `--copy-headers` and copies
 will be installed instead.
 
-Note that include paths relative to `PREFIX` may not be changed, since projects
-using LV2 use include paths like:
+Headers are installed in two paths, the universal URI-based style:
 
     #include "lv2/lv2plug.in/ns/ext/urid/urid.h"
 
+and the newer simple core style:
+
+    #include "lv2/urid/urid.h"
+
+Projects are encouraged to migrate to the latter style, though note that this
+style of include path may only be used by official LV2 specifications.
+
 
 Documentation
 -------------
diff --git a/lv2/lv2plug.in/ns/index.html.in b/doc/index.html.in
index b30f804..b30f804 100644
--- a/lv2/lv2plug.in/ns/index.html.in
+++ b/doc/index.html.in
diff --git a/doc/reference.doxygen.in b/doc/reference.doxygen.in
index ff210f4..8f1d467 100644
--- a/doc/reference.doxygen.in
+++ b/doc/reference.doxygen.in
@@ -781,34 +781,34 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = @LV2_SRCDIR@/doc/mainpage.dox \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/atom/atom.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/atom/forge.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/atom/util.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/data-access/data-access.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/event/event-helpers.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/event/event.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/log/log.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/log/logger.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/midi/midi.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/morph/morph.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/options/options.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/parameters/parameters.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/patch/patch.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/port-props/port-props.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/presets/presets.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/state/state.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/time/time.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/urid/urid.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/ext/worker/worker.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/extensions/ui/ui.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/extensions/units/units.h \
-                         @LV2_SRCDIR@/lv2/lv2plug.in/ns/lv2core/lv2.h
+                         @LV2_SRCDIR@/lv2/atom/atom.h \
+                         @LV2_SRCDIR@/lv2/atom/forge.h \
+                         @LV2_SRCDIR@/lv2/atom/util.h \
+                         @LV2_SRCDIR@/lv2/buf-size/buf-size.h \
+                         @LV2_SRCDIR@/lv2/core/lv2.h \
+                         @LV2_SRCDIR@/lv2/data-access/data-access.h \
+                         @LV2_SRCDIR@/lv2/dynmanifest/dynmanifest.h \
+                         @LV2_SRCDIR@/lv2/event/event-helpers.h \
+                         @LV2_SRCDIR@/lv2/event/event.h \
+                         @LV2_SRCDIR@/lv2/instance-access/instance-access.h \
+                         @LV2_SRCDIR@/lv2/log/log.h \
+                         @LV2_SRCDIR@/lv2/log/logger.h \
+                         @LV2_SRCDIR@/lv2/midi/midi.h \
+                         @LV2_SRCDIR@/lv2/morph/morph.h \
+                         @LV2_SRCDIR@/lv2/options/options.h \
+                         @LV2_SRCDIR@/lv2/parameters/parameters.h \
+                         @LV2_SRCDIR@/lv2/patch/patch.h \
+                         @LV2_SRCDIR@/lv2/port-groups/port-groups.h \
+                         @LV2_SRCDIR@/lv2/port-props/port-props.h \
+                         @LV2_SRCDIR@/lv2/presets/presets.h \
+                         @LV2_SRCDIR@/lv2/resize-port/resize-port.h \
+                         @LV2_SRCDIR@/lv2/state/state.h \
+                         @LV2_SRCDIR@/lv2/time/time.h \
+                         @LV2_SRCDIR@/lv2/ui/ui.h \
+                         @LV2_SRCDIR@/lv2/units/units.h \
+                         @LV2_SRCDIR@/lv2/uri-map/uri-map.h \
+                         @LV2_SRCDIR@/lv2/urid/urid.h \
+                         @LV2_SRCDIR@/lv2/worker/worker.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom-test.c b/lv2/atom/atom-test.c
index 72bf4ea..d694e4b 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom-test.c
+++ b/lv2/atom/atom-test.c
@@ -19,8 +19,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
 
 char**   uris   = NULL;
 uint32_t n_uris = 0;
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.h b/lv2/atom/atom.h
index cb5c067..cb5c067 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.h
+++ b/lv2/atom/atom.h
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.ttl b/lv2/atom/atom.ttl
index 891cd1f..891cd1f 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.ttl
+++ b/lv2/atom/atom.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/forge.h b/lv2/atom/forge.h
index bcdbf9e..befbb6e 100644
--- a/lv2/lv2plug.in/ns/ext/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -50,9 +50,9 @@
 
 #include <assert.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/util.h"
+#include "lv2/urid/urid.h"
 
 #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
 #    define LV2_ATOM_FORGE_DEPRECATED __attribute__((__deprecated__))
diff --git a/lv2/lv2plug.in/ns/ext/atom/lv2-atom.doap.ttl b/lv2/atom/lv2-atom.doap.ttl
index 681ff77..681ff77 100644
--- a/lv2/lv2plug.in/ns/ext/atom/lv2-atom.doap.ttl
+++ b/lv2/atom/lv2-atom.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl b/lv2/atom/manifest.ttl
index ebdf111..ebdf111 100644
--- a/lv2/lv2plug.in/ns/ext/atom/manifest.ttl
+++ b/lv2/atom/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/atom/util.h b/lv2/atom/util.h
index 5574e9b..cb3dbc8 100644
--- a/lv2/lv2plug.in/ns/ext/atom/util.h
+++ b/lv2/atom/util.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
+#include "lv2/atom/atom.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h b/lv2/buf-size/buf-size.h
index 900f8fa..900f8fa 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.h
+++ b/lv2/buf-size/buf-size.h
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.ttl b/lv2/buf-size/buf-size.ttl
index f8a9d60..f8a9d60 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/buf-size.ttl
+++ b/lv2/buf-size/buf-size.ttl
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/lv2-buf-size.doap.ttl b/lv2/buf-size/lv2-buf-size.doap.ttl
index bc6ffe9..bc6ffe9 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/lv2-buf-size.doap.ttl
+++ b/lv2/buf-size/lv2-buf-size.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/buf-size/manifest.ttl b/lv2/buf-size/manifest.ttl
index aeccc99..aeccc99 100644
--- a/lv2/lv2plug.in/ns/ext/buf-size/manifest.ttl
+++ b/lv2/buf-size/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2.h b/lv2/core/lv2.h
index eaca514..3bfdd02 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2.h
+++ b/lv2/core/lv2.h
@@ -19,7 +19,7 @@
 */
 
 /**
-   @defgroup lv2core LV2 Core
+   @defgroup core LV2 Core
 
    Core LV2 specification, see <http://lv2plug.in/ns/lv2core> for details.
 
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2_util.h b/lv2/core/lv2_util.h
index 561e201..e82d097 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2_util.h
+++ b/lv2/core/lv2_util.h
@@ -20,9 +20,10 @@
    @{
 */
 
+#include <stdarg.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl b/lv2/core/lv2core.doap.ttl
index 2f90f31..2f90f31 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/core/lv2core.doap.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl b/lv2/core/lv2core.ttl
index dd3e6bd..dd3e6bd 100644
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.ttl
+++ b/lv2/core/lv2core.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/manifest.ttl b/lv2/core/manifest.ttl
index d331434..d331434 100644
--- a/lv2/lv2plug.in/ns/lv2core/manifest.ttl
+++ b/lv2/core/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/meta.ttl b/lv2/core/meta.ttl
index 8a78e64..8ed9595 100644
--- a/lv2/lv2plug.in/ns/lv2core/meta.ttl
+++ b/lv2/core/meta.ttl
@@ -38,7 +38,7 @@ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH R
 		meta:kfoltman ,
 		meta:paniq ;
 	doap:release [
-		doap:revision "1.15.3" ;
+		doap:revision "1.15.4" ;
 		doap:created "2018-09-22" ;
 		dcs:blame <http://drobilla.net/drobilla#me> ;
 		dcs:changeset [
diff --git a/lv2/lv2plug.in/ns/ext/data-access/data-access.h b/lv2/data-access/data-access.h
index 2f4fd28..2f4fd28 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/data-access.h
+++ b/lv2/data-access/data-access.h
diff --git a/lv2/lv2plug.in/ns/ext/data-access/data-access.ttl b/lv2/data-access/data-access.ttl
index 654b714..654b714 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/data-access.ttl
+++ b/lv2/data-access/data-access.ttl
diff --git a/lv2/lv2plug.in/ns/ext/data-access/lv2-data-access.doap.ttl b/lv2/data-access/lv2-data-access.doap.ttl
index d577e63..d577e63 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/lv2-data-access.doap.ttl
+++ b/lv2/data-access/lv2-data-access.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/data-access/manifest.ttl b/lv2/data-access/manifest.ttl
index 85e50fc..85e50fc 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/manifest.ttl
+++ b/lv2/data-access/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h b/lv2/dynmanifest/dynmanifest.h
index 9725ee4..255d063 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.h
+++ b/lv2/dynmanifest/dynmanifest.h
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_DYN_MANIFEST_URI    "http://lv2plug.in/ns/ext/dynmanifest"  ///< http://lv2plug.in/ns/ext/dynmanifest
 #define LV2_DYN_MANIFEST_PREFIX LV2_DYN_MANIFEST_URI "#"                ///< http://lv2plug.in/ns/ext/dynmanifest#
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.ttl b/lv2/dynmanifest/dynmanifest.ttl
index 63e0730..63e0730 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/dynmanifest.ttl
+++ b/lv2/dynmanifest/dynmanifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl b/lv2/dynmanifest/lv2-dynmanifest.doap.ttl
index 9dd6c81..9dd6c81 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
+++ b/lv2/dynmanifest/lv2-dynmanifest.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/dynmanifest/manifest.ttl b/lv2/dynmanifest/manifest.ttl
index 784fb30..784fb30 100644
--- a/lv2/lv2plug.in/ns/ext/dynmanifest/manifest.ttl
+++ b/lv2/dynmanifest/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/event-helpers.h b/lv2/event/event-helpers.h
index 5993dc0..6eab3b6 100644
--- a/lv2/lv2plug.in/ns/ext/event/event-helpers.h
+++ b/lv2/event/event-helpers.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/event/event.h"
+#include "lv2/event/event.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/event/event.h b/lv2/event/event.h
index 8b850d1..8b850d1 100644
--- a/lv2/lv2plug.in/ns/ext/event/event.h
+++ b/lv2/event/event.h
diff --git a/lv2/lv2plug.in/ns/ext/event/event.ttl b/lv2/event/event.ttl
index 94e429f..94e429f 100644
--- a/lv2/lv2plug.in/ns/ext/event/event.ttl
+++ b/lv2/event/event.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl b/lv2/event/lv2-event.doap.ttl
index 5051237..5051237 100644
--- a/lv2/lv2plug.in/ns/ext/event/lv2-event.doap.ttl
+++ b/lv2/event/lv2-event.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/event/manifest.ttl b/lv2/event/manifest.ttl
index 0b454e2..0b454e2 100644
--- a/lv2/lv2plug.in/ns/ext/event/manifest.ttl
+++ b/lv2/event/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h b/lv2/instance-access/instance-access.h
index 7e328fd..7e328fd 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.h
+++ b/lv2/instance-access/instance-access.h
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.ttl b/lv2/instance-access/instance-access.ttl
index 5656345..5656345 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/instance-access.ttl
+++ b/lv2/instance-access/instance-access.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/lv2-instance-access.doap.ttl b/lv2/instance-access/lv2-instance-access.doap.ttl
index 5aa70d8..5aa70d8 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/lv2-instance-access.doap.ttl
+++ b/lv2/instance-access/lv2-instance-access.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/instance-access/manifest.ttl b/lv2/instance-access/manifest.ttl
index cee5dbf..cee5dbf 100644
--- a/lv2/lv2plug.in/ns/ext/instance-access/manifest.ttl
+++ b/lv2/instance-access/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/log.h b/lv2/log/log.h
index 10a26cd..11bb35a 100644
--- a/lv2/lv2plug.in/ns/ext/log/log.h
+++ b/lv2/log/log.h
@@ -38,7 +38,7 @@
 
 #include <stdarg.h>
 
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/urid/urid.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/log/log.ttl b/lv2/log/log.ttl
index 60e1d3f..60e1d3f 100644
--- a/lv2/lv2plug.in/ns/ext/log/log.ttl
+++ b/lv2/log/log.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/logger.h b/lv2/log/logger.h
index 7422dba..0c608a6 100644
--- a/lv2/lv2plug.in/ns/ext/log/logger.h
+++ b/lv2/log/logger.h
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
+#include "lv2/log/log.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lv2/lv2plug.in/ns/ext/log/lv2-log.doap.ttl b/lv2/log/lv2-log.doap.ttl
index d109809..d109809 100644
--- a/lv2/lv2plug.in/ns/ext/log/lv2-log.doap.ttl
+++ b/lv2/log/lv2-log.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/log/manifest.ttl b/lv2/log/manifest.ttl
index afe7449..afe7449 100644
--- a/lv2/lv2plug.in/ns/ext/log/manifest.ttl
+++ b/lv2/log/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/lv2core/README b/lv2/lv2plug.in/ns/lv2core/README
deleted file mode 100644
index f49513f..0000000
--- a/lv2/lv2plug.in/ns/lv2core/README
+++ /dev/null
@@ -1,42 +0,0 @@
-LV2
-===
-
-LV2 gives programmers the ability to write audio processors (or "plugins") in
-C/C++ which can be dynamically loaded into a range of applications (or
-"hosts").
-
-This core specification is deliberately as short and simple as possible, but is
-designed so that extensions can be defined to add more advanced features.
-
-More information about LV2 can be found at <http://lv2plug.in>.
-
-
-Using LV2
----------
-
-Applications that use LV2 plugins should depend on this package.  It includes a
-header, LV2 bundle, and a pkg-config file.  To compile against LV2, build
-scripts should check for the pkg-config package "lv2core", or simply check for
-the header "lv2/lv2plug.in/ns/lv2core/lv2.h".
-
-The appropriate C include for LV2 specifications is based on their URI, e.g.:
-
-    #include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-
-Is how code should include the header "lv2.h" in this bundle, which defines the
-specification with URI "http://lv2plug.in/ns/lv2core".  Other specifications
-should follow this convention, e.g. the correct way to include the header
-"foo.h" in the extension "http://example.org/foo" is:
-
-    #include "lv2/example.org/foo/foo.h"
-
-
-Packaging
----------
-
-Please package these components in a single package (i.e. do not split the
-headers, data, and program into separate packages).  This package, in its
-entirety, is a build and run time dependency of any code that uses LV2.
-Distributions are encouraged to include it with package name "lv2core".
-
- -- David Robillard <d@drobilla.net>
diff --git a/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in b/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in
deleted file mode 100644
index 96e5169..0000000
--- a/lv2/lv2plug.in/ns/lv2core/lv2core.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@EXEC_PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: lv2core
-Version: @LV2CORE_VERSION@
-Description: An audio plugin interface specification.
-Libs:
-Cflags: -I${includedir}
diff --git a/lv2/lv2plug.in/ns/lv2core/wscript b/lv2/lv2plug.in/ns/lv2core/wscript
deleted file mode 100644
index c70aa1d..0000000
--- a/lv2/lv2plug.in/ns/lv2core/wscript
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env python
-import os
-
-from waflib.extras import autowaf as autowaf
-import waflib.Options as Options
-import glob
-
-# Version of this package (even if built as a child)
-LV2CORE_VERSION = '12.0'
-
-# Variables for 'waf dist'
-APPNAME = 'lv2core'
-VERSION = LV2CORE_VERSION
-
-# Mandatory variables
-top = '.'
-out = 'build'
-
-def options(opt):
-    opt.load('compiler_c')
-    autowaf.set_options(opt)
-    opt.add_option('--bundle-only', action='store_true', default=False,
-                   dest='bundle_only',
-                   help="Only install bundle (not header or pkg-config file)")
-    opt.add_option('--copy-headers', action='store_true', default=False,
-                   dest='copy_headers',
-                   help='Copy headers instead of linking to bundle')
-
-def configure(conf):
-    if not hasattr(os.path, 'relpath') and not Options.options.copy_headers:
-        conf.fatal(
-            'os.path.relpath missing, get Python 2.6 or use --copy-headers')
-
-    conf.load('compiler_c', cache=True)
-    conf.load('autowaf', cache=True)
-
-    autowaf.display_msg(conf, "LV2 bundle directory", conf.env['LV2DIR'])
-    print('')
-
-def build(bld):
-    # Header "library"
-    bld(export_includes = ['.'],
-        name            = 'liblv2core',
-        target          = 'lv2core')
-
-    # Bundle (data)
-    bld.install_files('${LV2DIR}/lv2core.lv2', bld.path.ant_glob('*.ttl'))
-
-    if not Options.options.bundle_only:
-        # Header
-        bld.install_files('${INCLUDEDIR}', 'lv2.h')
-        bld.install_files('${LV2DIR}/lv2core.lv2', 'lv2.h')
-        bld.install_files('${LV2DIR}/lv2core.lv2', 'lv2_util.h')
-
-        # Pkgconfig file
-        autowaf.build_pc(bld, 'LV2CORE', LV2CORE_VERSION, '', [])
-
-        # URI-like header include
-        include_dir = os.path.join(bld.env['INCLUDEDIR'], 'lv2/lv2plug.in/ns')
-        bundle_dir  = os.path.join(bld.env['LV2DIR'], 'lv2core.lv2')
-        if bld.env['COPY_HEADERS']:
-            bld.install_files(os.path.join(include_dir, 'lv2core'),
-                              bld.path.ant_glob('*.h'))
-        else:
-            bld.symlink_as(os.path.join(include_dir, 'lv2core'),
-                           os.path.relpath(bundle_dir, include_dir))
-
-def news(ctx):
-    path = ctx.path.abspath()
-    autowaf.write_news(APPNAME,
-                       glob.glob(os.path.join(path, '*.ttl')),
-                       os.path.join(path, 'NEWS'))
-
-def pre_dist(ctx):
-    # Write NEWS file in source directory
-    news(ctx)
-
-def post_dist(ctx):
-    # Delete generated NEWS file
-    try:
-        os.remove(os.path.join(ctx.path.abspath(), 'NEWS'))
-    except:
-        pass
diff --git a/lv2/lv2plug.in/ns/ext/midi/lv2-midi.doap.ttl b/lv2/midi/lv2-midi.doap.ttl
index 822e135..822e135 100644
--- a/lv2/lv2plug.in/ns/ext/midi/lv2-midi.doap.ttl
+++ b/lv2/midi/lv2-midi.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/midi/manifest.ttl b/lv2/midi/manifest.ttl
index 754028d..754028d 100644
--- a/lv2/lv2plug.in/ns/ext/midi/manifest.ttl
+++ b/lv2/midi/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/midi/midi.h b/lv2/midi/midi.h
index 79e3a83..79e3a83 100644
--- a/lv2/lv2plug.in/ns/ext/midi/midi.h
+++ b/lv2/midi/midi.h
diff --git a/lv2/lv2plug.in/ns/ext/midi/midi.ttl b/lv2/midi/midi.ttl
index 23e41b3..23e41b3 100644
--- a/lv2/lv2plug.in/ns/ext/midi/midi.ttl
+++ b/lv2/midi/midi.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/lv2-morph.doap.ttl b/lv2/morph/lv2-morph.doap.ttl
index 533cf10..533cf10 100644
--- a/lv2/lv2plug.in/ns/ext/morph/lv2-morph.doap.ttl
+++ b/lv2/morph/lv2-morph.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/manifest.ttl b/lv2/morph/manifest.ttl
index 40b0f2b..40b0f2b 100644
--- a/lv2/lv2plug.in/ns/ext/morph/manifest.ttl
+++ b/lv2/morph/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/morph/morph.h b/lv2/morph/morph.h
index 884af74..884af74 100644
--- a/lv2/lv2plug.in/ns/ext/morph/morph.h
+++ b/lv2/morph/morph.h
diff --git a/lv2/lv2plug.in/ns/ext/morph/morph.ttl b/lv2/morph/morph.ttl
index 2a2e9fc..2a2e9fc 100644
--- a/lv2/lv2plug.in/ns/ext/morph/morph.ttl
+++ b/lv2/morph/morph.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/lv2-options.doap.ttl b/lv2/options/lv2-options.doap.ttl
index d828360..d828360 100644
--- a/lv2/lv2plug.in/ns/ext/options/lv2-options.doap.ttl
+++ b/lv2/options/lv2-options.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/manifest.ttl b/lv2/options/manifest.ttl
index c0c3315..c0c3315 100644
--- a/lv2/lv2plug.in/ns/ext/options/manifest.ttl
+++ b/lv2/options/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/options/options.h b/lv2/options/options.h
index 433dd1c..c1dad83 100644
--- a/lv2/lv2plug.in/ns/ext/options/options.h
+++ b/lv2/options/options.h
@@ -28,8 +28,8 @@
 
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
+#include "lv2/urid/urid.h"
 
 #define LV2_OPTIONS_URI    "http://lv2plug.in/ns/ext/options"  ///< http://lv2plug.in/ns/ext/options
 #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#"                 ///< http://lv2plug.in/ns/ext/options#
diff --git a/lv2/lv2plug.in/ns/ext/options/options.ttl b/lv2/options/options.ttl
index b0f752c..b0f752c 100644
--- a/lv2/lv2plug.in/ns/ext/options/options.ttl
+++ b/lv2/options/options.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/lv2-parameters.doap.ttl b/lv2/parameters/lv2-parameters.doap.ttl
index 3ff707c..3ff707c 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/lv2-parameters.doap.ttl
+++ b/lv2/parameters/lv2-parameters.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/manifest.ttl b/lv2/parameters/manifest.ttl
index d2ba8fa..d2ba8fa 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/manifest.ttl
+++ b/lv2/parameters/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/parameters/parameters.h b/lv2/parameters/parameters.h
index f81e78b..f81e78b 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/parameters.h
+++ b/lv2/parameters/parameters.h
diff --git a/lv2/lv2plug.in/ns/ext/parameters/parameters.ttl b/lv2/parameters/parameters.ttl
index f8ad2ab..f8ad2ab 100644
--- a/lv2/lv2plug.in/ns/ext/parameters/parameters.ttl
+++ b/lv2/parameters/parameters.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/lv2-patch.doap.ttl b/lv2/patch/lv2-patch.doap.ttl
index 34c091f..34c091f 100644
--- a/lv2/lv2plug.in/ns/ext/patch/lv2-patch.doap.ttl
+++ b/lv2/patch/lv2-patch.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/manifest.ttl b/lv2/patch/manifest.ttl
index 9803a5d..9803a5d 100644
--- a/lv2/lv2plug.in/ns/ext/patch/manifest.ttl
+++ b/lv2/patch/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/patch/patch.h b/lv2/patch/patch.h
index fed6a87..fed6a87 100644
--- a/lv2/lv2plug.in/ns/ext/patch/patch.h
+++ b/lv2/patch/patch.h
diff --git a/lv2/lv2plug.in/ns/ext/patch/patch.ttl b/lv2/patch/patch.ttl
index 71c51a3..71c51a3 100644
--- a/lv2/lv2plug.in/ns/ext/patch/patch.ttl
+++ b/lv2/patch/patch.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/lv2-port-groups.doap.ttl b/lv2/port-groups/lv2-port-groups.doap.ttl
index 90848d2..90848d2 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/lv2-port-groups.doap.ttl
+++ b/lv2/port-groups/lv2-port-groups.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/manifest.ttl b/lv2/port-groups/manifest.ttl
index fa893c6..fa893c6 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/manifest.ttl
+++ b/lv2/port-groups/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h b/lv2/port-groups/port-groups.h
index a1bcd12..a1bcd12 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.h
+++ b/lv2/port-groups/port-groups.h
diff --git a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.ttl b/lv2/port-groups/port-groups.ttl
index 0681e42..0681e42 100644
--- a/lv2/lv2plug.in/ns/ext/port-groups/port-groups.ttl
+++ b/lv2/port-groups/port-groups.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/lv2-port-props.doap.ttl b/lv2/port-props/lv2-port-props.doap.ttl
index b199d36..b199d36 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/lv2-port-props.doap.ttl
+++ b/lv2/port-props/lv2-port-props.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/manifest.ttl b/lv2/port-props/manifest.ttl
index 27f15c9..27f15c9 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/manifest.ttl
+++ b/lv2/port-props/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/port-props/port-props.h b/lv2/port-props/port-props.h
index ef2b64d..ef2b64d 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/port-props.h
+++ b/lv2/port-props/port-props.h
diff --git a/lv2/lv2plug.in/ns/ext/port-props/port-props.ttl b/lv2/port-props/port-props.ttl
index f27f51e..f27f51e 100644
--- a/lv2/lv2plug.in/ns/ext/port-props/port-props.ttl
+++ b/lv2/port-props/port-props.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/lv2-presets.doap.ttl b/lv2/presets/lv2-presets.doap.ttl
index 5ba8867..5ba8867 100644
--- a/lv2/lv2plug.in/ns/ext/presets/lv2-presets.doap.ttl
+++ b/lv2/presets/lv2-presets.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/manifest.ttl b/lv2/presets/manifest.ttl
index d1fc482..d1fc482 100644
--- a/lv2/lv2plug.in/ns/ext/presets/manifest.ttl
+++ b/lv2/presets/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/presets/presets.h b/lv2/presets/presets.h
index 7c51b1c..7c51b1c 100644
--- a/lv2/lv2plug.in/ns/ext/presets/presets.h
+++ b/lv2/presets/presets.h
diff --git a/lv2/lv2plug.in/ns/ext/presets/presets.ttl b/lv2/presets/presets.ttl
index da7e9bb..da7e9bb 100644
--- a/lv2/lv2plug.in/ns/ext/presets/presets.ttl
+++ b/lv2/presets/presets.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/lv2-resize-port.doap.ttl b/lv2/resize-port/lv2-resize-port.doap.ttl
index 49ab3cb..49ab3cb 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/lv2-resize-port.doap.ttl
+++ b/lv2/resize-port/lv2-resize-port.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/manifest.ttl b/lv2/resize-port/manifest.ttl
index 21569ae..21569ae 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/manifest.ttl
+++ b/lv2/resize-port/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h b/lv2/resize-port/resize-port.h
index 5eb47f2..5eb47f2 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.h
+++ b/lv2/resize-port/resize-port.h
diff --git a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.ttl b/lv2/resize-port/resize-port.ttl
index 6688f90..6688f90 100644
--- a/lv2/lv2plug.in/ns/ext/resize-port/resize-port.ttl
+++ b/lv2/resize-port/resize-port.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/lv2-state.doap.ttl b/lv2/state/lv2-state.doap.ttl
index fd87a13..fd87a13 100644
--- a/lv2/lv2plug.in/ns/ext/state/lv2-state.doap.ttl
+++ b/lv2/state/lv2-state.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/manifest.ttl b/lv2/state/manifest.ttl
index 2a54874..2a54874 100644
--- a/lv2/lv2plug.in/ns/ext/state/manifest.ttl
+++ b/lv2/state/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/state/state.h b/lv2/state/state.h
index f2a4afa..ffc40d1 100644
--- a/lv2/lv2plug.in/ns/ext/state/state.h
+++ b/lv2/state/state.h
@@ -30,7 +30,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_STATE_URI    "http://lv2plug.in/ns/ext/state"  ///< http://lv2plug.in/ns/ext/state
 #define LV2_STATE_PREFIX LV2_STATE_URI "#"                 ///< http://lv2plug.in/ns/ext/state#
diff --git a/lv2/lv2plug.in/ns/ext/state/state.ttl b/lv2/state/state.ttl
index c86fea7..c86fea7 100644
--- a/lv2/lv2plug.in/ns/ext/state/state.ttl
+++ b/lv2/state/state.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/lv2-time.doap.ttl b/lv2/time/lv2-time.doap.ttl
index c380d46..c380d46 100644
--- a/lv2/lv2plug.in/ns/ext/time/lv2-time.doap.ttl
+++ b/lv2/time/lv2-time.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/manifest.ttl b/lv2/time/manifest.ttl
index 3a8bfee..3a8bfee 100644
--- a/lv2/lv2plug.in/ns/ext/time/manifest.ttl
+++ b/lv2/time/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/time/time.h b/lv2/time/time.h
index ec5007c..ec5007c 100644
--- a/lv2/lv2plug.in/ns/ext/time/time.h
+++ b/lv2/time/time.h
diff --git a/lv2/lv2plug.in/ns/ext/time/time.ttl b/lv2/time/time.ttl
index 13137af..13137af 100644
--- a/lv2/lv2plug.in/ns/ext/time/time.ttl
+++ b/lv2/time/time.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/lv2-ui.doap.ttl b/lv2/ui/lv2-ui.doap.ttl
index 8b804b1..8b804b1 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/lv2-ui.doap.ttl
+++ b/lv2/ui/lv2-ui.doap.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/manifest.ttl b/lv2/ui/manifest.ttl
index 384bf2e..384bf2e 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/manifest.ttl
+++ b/lv2/ui/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/ui/ui.h b/lv2/ui/ui.h
index 2c71df0..96fdbac 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/ui.h
+++ b/lv2/ui/ui.h
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_UI_URI    "http://lv2plug.in/ns/extensions/ui"  ///< http://lv2plug.in/ns/extensions/ui
 #define LV2_UI_PREFIX LV2_UI_URI "#"                        ///< http://lv2plug.in/ns/extensions/ui#
diff --git a/lv2/lv2plug.in/ns/extensions/ui/ui.ttl b/lv2/ui/ui.ttl
index f0444b5..f0444b5 100644
--- a/lv2/lv2plug.in/ns/extensions/ui/ui.ttl
+++ b/lv2/ui/ui.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/lv2-units.doap.ttl b/lv2/units/lv2-units.doap.ttl
index e81aa70..e81aa70 100644
--- a/lv2/lv2plug.in/ns/extensions/units/lv2-units.doap.ttl
+++ b/lv2/units/lv2-units.doap.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/manifest.ttl b/lv2/units/manifest.ttl
index 641f6a1..641f6a1 100644
--- a/lv2/lv2plug.in/ns/extensions/units/manifest.ttl
+++ b/lv2/units/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/extensions/units/units.h b/lv2/units/units.h
index 1debf60..1debf60 100644
--- a/lv2/lv2plug.in/ns/extensions/units/units.h
+++ b/lv2/units/units.h
diff --git a/lv2/lv2plug.in/ns/extensions/units/units.ttl b/lv2/units/units.ttl
index e40bef6..e40bef6 100644
--- a/lv2/lv2plug.in/ns/extensions/units/units.ttl
+++ b/lv2/units/units.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/lv2-uri-map.doap.ttl b/lv2/uri-map/lv2-uri-map.doap.ttl
index df0feb7..df0feb7 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/lv2-uri-map.doap.ttl
+++ b/lv2/uri-map/lv2-uri-map.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/manifest.ttl b/lv2/uri-map/manifest.ttl
index 87087b6..87087b6 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/manifest.ttl
+++ b/lv2/uri-map/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h b/lv2/uri-map/uri-map.h
index 12d52be..12d52be 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h
+++ b/lv2/uri-map/uri-map.h
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.ttl b/lv2/uri-map/uri-map.ttl
index 7f6b0e7..7f6b0e7 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.ttl
+++ b/lv2/uri-map/uri-map.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/lv2-urid.doap.ttl b/lv2/urid/lv2-urid.doap.ttl
index b79545c..b79545c 100644
--- a/lv2/lv2plug.in/ns/ext/urid/lv2-urid.doap.ttl
+++ b/lv2/urid/lv2-urid.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/manifest.ttl b/lv2/urid/manifest.ttl
index 19b5832..19b5832 100644
--- a/lv2/lv2plug.in/ns/ext/urid/manifest.ttl
+++ b/lv2/urid/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.h b/lv2/urid/urid.h
index c9ee2e0..c9ee2e0 100644
--- a/lv2/lv2plug.in/ns/ext/urid/urid.h
+++ b/lv2/urid/urid.h
diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.ttl b/lv2/urid/urid.ttl
index 29b196a..29b196a 100644
--- a/lv2/lv2plug.in/ns/ext/urid/urid.ttl
+++ b/lv2/urid/urid.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/lv2-worker.doap.ttl b/lv2/worker/lv2-worker.doap.ttl
index b01159b..b01159b 100644
--- a/lv2/lv2plug.in/ns/ext/worker/lv2-worker.doap.ttl
+++ b/lv2/worker/lv2-worker.doap.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/manifest.ttl b/lv2/worker/manifest.ttl
index 28c2129..28c2129 100644
--- a/lv2/lv2plug.in/ns/ext/worker/manifest.ttl
+++ b/lv2/worker/manifest.ttl
diff --git a/lv2/lv2plug.in/ns/ext/worker/worker.h b/lv2/worker/worker.h
index 66e51de..6926887 100644
--- a/lv2/lv2plug.in/ns/ext/worker/worker.h
+++ b/lv2/worker/worker.h
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 #define LV2_WORKER_URI    "http://lv2plug.in/ns/ext/worker"  ///< http://lv2plug.in/ns/ext/worker
 #define LV2_WORKER_PREFIX LV2_WORKER_URI "#"                 ///< http://lv2plug.in/ns/ext/worker#
diff --git a/lv2/lv2plug.in/ns/ext/worker/worker.ttl b/lv2/worker/worker.ttl
index 6b32742..6b32742 100644
--- a/lv2/lv2plug.in/ns/ext/worker/worker.ttl
+++ b/lv2/worker/worker.ttl
diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py
index ff07128..ada5bd8 100755
--- a/lv2specgen/lv2specgen.py
+++ b/lv2specgen/lv2specgen.py
@@ -1118,7 +1118,7 @@ def load_tags(path, docdir):
     return linkmap
 
 
-def writeIndex(model, specloc, index_path, root_path):
+def writeIndex(model, specloc, index_path, root_path, root_uri):
     # Get extension URI
     ext_node = model.value(None, rdf.type, lv2.Specification)
     if not ext_node:
@@ -1163,8 +1163,13 @@ def writeIndex(model, specloc, index_path, root_path):
     if name.startswith('LV2 '):
         name = name[4:]
 
+    # Find relative link target
+    if root_uri and ext_node.startswith(root_uri):
+        target = ext_node[len(root_uri):]
+    else:
+        target = os.path.relpath(ext_node, root_path)
+
     # Specification (comment is to act as a sort key)
-    target = os.path.relpath(os.path.dirname(specloc), root_path)
     if not options.online_docs:
         target += '/%s.html' % b
     row = '<tr><!-- %s --><td><a rel="rdfs:seeAlso" href="%s">%s</a></td>' % (
@@ -1204,7 +1209,7 @@ def writeIndex(model, specloc, index_path, root_path):
     index.close()
 
 
-def specgen(specloc, indir, style_uri, docdir, tags, opts, instances=False, root_link=None, index_path=None, root_path=None):
+def specgen(specloc, indir, style_uri, docdir, tags, opts, instances=False, root_link=None, index_path=None, root_path=None, root_uri=None):
     """The meat and potatoes: Everything starts here."""
 
     global spec_bundle
@@ -1384,7 +1389,7 @@ def specgen(specloc, indir, style_uri, docdir, tags, opts, instances=False, root
 
     # Write index row
     if index_path is not None:
-        writeIndex(m, specloc, index_path, root_path)
+        writeIndex(m, specloc, index_path, root_path, root_uri)
 
     return template
 
@@ -1452,8 +1457,10 @@ if __name__ == "__main__":
                    help='Index row output file')
     opt.add_option('--tags', type='string', dest='tags', default=None,
                    help='Doxygen tags file')
-    opt.add_option('-r', '--root', type='string', dest='root', default='',
+    opt.add_option('-r', '--root-path', type='string', dest='root_path', default='',
                    help='Root path')
+    opt.add_option('-R', '--root-uri', type='string', dest='root_uri', default='',
+                   help='Root URI')
     opt.add_option('-p', '--prefix', type='string', dest='prefix',
                    help='Specification Turtle prefix')
     opt.add_option('-i', '--instances', action='store_true', dest='instances',
@@ -1490,7 +1497,8 @@ if __name__ == "__main__":
         sys.exit(1)
 
     # Root link
-    root_path = opts['root']
+    root_path = opts['root_path']
+    root_uri  = opts['root_uri']
     root_link = os.path.relpath(root_path, path) if root_path else '.'
     if not options.online_docs:
         root_link = os.path.join(root_link, 'index.html')
@@ -1506,7 +1514,8 @@ if __name__ == "__main__":
         instances=True,
         root_link=root_link,
         index_path=index_path,
-        root_path=root_path)
+        root_path=root_path,
+        root_uri=root_uri)
 
     # Save to HTML output file
     save(output, specdoc)
diff --git a/plugins/eg-amp.lv2/amp.c b/plugins/eg-amp.lv2/amp.c
index 4aef8d4..b3fc7b4 100644
--- a/plugins/eg-amp.lv2/amp.c
+++ b/plugins/eg-amp.lv2/amp.c
@@ -26,7 +26,7 @@
    replacing `http:/` with `lv2` any header in the specification bundle can be
    included, in this case `lv2.h`.
 */
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
+#include "lv2/core/lv2.h"
 
 /**
    The URI is the identifier for a plugin, and how the host associates this
diff --git a/plugins/eg-fifths.lv2/fifths.c b/plugins/eg-fifths.lv2/fifths.c
index 0141fa2..ef7b5a0 100644
--- a/plugins/eg-fifths.lv2/fifths.c
+++ b/plugins/eg-fifths.lv2/fifths.c
@@ -23,14 +23,14 @@
 #    include <stdbool.h>
 #endif
 
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/logger.h"
+#include "lv2/midi/midi.h"
+#include "lv2/patch/patch.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #include "./uris.h"
 
diff --git a/plugins/eg-fifths.lv2/uris.h b/plugins/eg-fifths.lv2/uris.h
index 361334c..506e164 100644
--- a/plugins/eg-fifths.lv2/uris.h
+++ b/plugins/eg-fifths.lv2/uris.h
@@ -18,9 +18,9 @@
 #ifndef FIFTHS_URIS_H
 #define FIFTHS_URIS_H
 
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
+#include "lv2/log/log.h"
+#include "lv2/midi/midi.h"
+#include "lv2/state/state.h"
 
 #define EG_FIFTHS_URI "http://lv2plug.in/plugins/eg-fifths"
 
diff --git a/plugins/eg-metro.lv2/metro.c b/plugins/eg-metro.lv2/metro.c
index 05d7004..0f39ba1 100644
--- a/plugins/eg-metro.lv2/metro.c
+++ b/plugins/eg-metro.lv2/metro.c
@@ -23,13 +23,13 @@
 #    include <stdbool.h>
 #endif
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/time/time.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/logger.h"
+#include "lv2/time/time.h"
+#include "lv2/urid/urid.h"
 
 #ifndef M_PI
 #    define M_PI 3.14159265
diff --git a/plugins/eg-midigate.lv2/midigate.c b/plugins/eg-midigate.lv2/midigate.c
index a967384..7f7232d 100644
--- a/plugins/eg-midigate.lv2/midigate.c
+++ b/plugins/eg-midigate.lv2/midigate.c
@@ -19,13 +19,13 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/logger.h"
+#include "lv2/midi/midi.h"
+#include "lv2/urid/urid.h"
 
 #define MIDIGATE_URI "http://lv2plug.in/plugins/eg-midigate"
 
diff --git a/plugins/eg-params.lv2/params.c b/plugins/eg-params.lv2/params.c
index 3df6652..14d0a53 100644
--- a/plugins/eg-params.lv2/params.c
+++ b/plugins/eg-params.lv2/params.c
@@ -23,15 +23,15 @@
 #    include <stdbool.h>
 #endif
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/logger.h"
+#include "lv2/midi/midi.h"
+#include "lv2/patch/patch.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
 
 #include "state_map.h"
 
diff --git a/plugins/eg-sampler.lv2/peaks.h b/plugins/eg-sampler.lv2/peaks.h
index 69688b8..e3002c2 100644
--- a/plugins/eg-sampler.lv2/peaks.h
+++ b/plugins/eg-sampler.lv2/peaks.h
@@ -30,7 +30,7 @@
 
 #include <math.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
+#include "lv2/atom/forge.h"
 
 #define PEAKS_URI          "http://lv2plug.in/ns/peaks#"
 #define PEAKS__PeakUpdate  PEAKS_URI "PeakUpdate"
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index aa8a1c1..cc4b3dd 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -26,17 +26,17 @@
 
 #include <sndfile.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/ext/worker/worker.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/log.h"
+#include "lv2/log/logger.h"
+#include "lv2/midi/midi.h"
+#include "lv2/patch/patch.h"
+#include "lv2/state/state.h"
+#include "lv2/urid/urid.h"
+#include "lv2/worker/worker.h"
 
 #include "atom_sink.h"
 #include "peaks.h"
diff --git a/plugins/eg-sampler.lv2/sampler_ui.c b/plugins/eg-sampler.lv2/sampler_ui.c
index ac4601a..4fd5488 100644
--- a/plugins/eg-sampler.lv2/sampler_ui.c
+++ b/plugins/eg-sampler.lv2/sampler_ui.c
@@ -19,14 +19,14 @@
 
 #include <gtk/gtk.h>
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/atom/util.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/patch/patch.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/logger.h"
+#include "lv2/patch/patch.h"
+#include "lv2/ui/ui.h"
+#include "lv2/urid/urid.h"
 
 #include "peaks.h"
 #include "uris.h"
diff --git a/plugins/eg-sampler.lv2/uris.h b/plugins/eg-sampler.lv2/uris.h
index 9e44cf4..9a34458 100644
--- a/plugins/eg-sampler.lv2/uris.h
+++ b/plugins/eg-sampler.lv2/uris.h
@@ -18,10 +18,10 @@
 #ifndef SAMPLER_URIS_H
 #define SAMPLER_URIS_H
 
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/midi/midi.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h"
+#include "lv2/log/log.h"
+#include "lv2/midi/midi.h"
+#include "lv2/state/state.h"
+#include "lv2/parameters/parameters.h"
 
 #define EG_SAMPLER_URI          "http://lv2plug.in/plugins/eg-sampler"
 #define EG_SAMPLER__applySample EG_SAMPLER_URI "#applySample"
diff --git a/plugins/eg-scope.lv2/examploscope.c b/plugins/eg-scope.lv2/examploscope.c
index d672d25..f45932a 100644
--- a/plugins/eg-scope.lv2/examploscope.c
+++ b/plugins/eg-scope.lv2/examploscope.c
@@ -19,11 +19,11 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "lv2/lv2plug.in/ns/ext/log/log.h"
-#include "lv2/lv2plug.in/ns/ext/log/logger.h"
-#include "lv2/lv2plug.in/ns/ext/state/state.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2.h"
-#include "lv2/lv2plug.in/ns/lv2core/lv2_util.h"
+#include "lv2/core/lv2.h"
+#include "lv2/core/lv2_util.h"
+#include "lv2/log/log.h"
+#include "lv2/log/logger.h"
+#include "lv2/state/state.h"
 
 #include "./uris.h"
 
diff --git a/plugins/eg-scope.lv2/examploscope_ui.c b/plugins/eg-scope.lv2/examploscope_ui.c
index e2723c6..85dd95b 100644
--- a/plugins/eg-scope.lv2/examploscope_ui.c
+++ b/plugins/eg-scope.lv2/examploscope_ui.c
@@ -20,7 +20,7 @@
 #include <cairo.h>
 #include <gtk/gtk.h>
 
-#include "lv2/lv2plug.in/ns/extensions/ui/ui.h"
+#include "lv2/ui/ui.h"
 #include "./uris.h"
 
 // Drawing area size
diff --git a/plugins/eg-scope.lv2/uris.h b/plugins/eg-scope.lv2/uris.h
index 7c13c06..2ebaf4e 100644
--- a/plugins/eg-scope.lv2/uris.h
+++ b/plugins/eg-scope.lv2/uris.h
@@ -17,10 +17,10 @@
 #ifndef SCO_URIS_H
 #define SCO_URIS_H
 
-#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "lv2/lv2plug.in/ns/ext/parameters/parameters.h"
-#include "lv2/lv2plug.in/ns/ext/urid/urid.h"
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/parameters/parameters.h"
+#include "lv2/urid/urid.h"
 
 #define SCO_URI "http://lv2plug.in/plugins/eg-scope"
 
diff --git a/wscript b/wscript
index 802b42d..5e6af10 100644
--- a/wscript
+++ b/wscript
@@ -12,10 +12,37 @@ from waflib.extras import autowaf as autowaf
 
 # Mandatory waf variables
 APPNAME = 'lv2'     # Package name for waf dist
-VERSION = '1.15.3'  # Package version for waf dist
+VERSION = '1.15.4'  # Package version for waf dist
 top     = '.'       # Source directory
 out     = 'build'   # Build directory
 
+# Map of specification base name to old URI-style include path
+spec_map = {
+    'atom'            : 'lv2/lv2plug.in/ns/ext/atom',
+    'buf-size'        : 'lv2/lv2plug.in/ns/ext/buf-size',
+    'core'            : 'lv2/lv2plug.in/ns/lv2core',
+    'data-access'     : 'lv2/lv2plug.in/ns/ext/data-access',
+    'dynmanifest'     : 'lv2/lv2plug.in/ns/ext/dynmanifest',
+    'event'           : 'lv2/lv2plug.in/ns/ext/event',
+    'instance-access' : 'lv2/lv2plug.in/ns/ext/instance-access',
+    'log'             : 'lv2/lv2plug.in/ns/ext/log',
+    'midi'            : 'lv2/lv2plug.in/ns/ext/midi',
+    'morph'           : 'lv2/lv2plug.in/ns/ext/morph',
+    'options'         : 'lv2/lv2plug.in/ns/ext/options',
+    'parameters'      : 'lv2/lv2plug.in/ns/ext/parameters',
+    'patch'           : 'lv2/lv2plug.in/ns/ext/patch',
+    'port-groups'     : 'lv2/lv2plug.in/ns/ext/port-groups',
+    'port-props'      : 'lv2/lv2plug.in/ns/ext/port-props',
+    'presets'         : 'lv2/lv2plug.in/ns/ext/presets',
+    'resize-port'     : 'lv2/lv2plug.in/ns/ext/resize-port',
+    'state'           : 'lv2/lv2plug.in/ns/ext/state',
+    'time'            : 'lv2/lv2plug.in/ns/ext/time',
+    'ui'              : 'lv2/lv2plug.in/ns/extensions/ui',
+    'units'           : 'lv2/lv2plug.in/ns/extensions/units',
+    'uri-map'         : 'lv2/lv2plug.in/ns/ext/uri-map',
+    'urid'            : 'lv2/lv2plug.in/ns/ext/urid',
+    'worker'          : 'lv2/lv2plug.in/ns/ext/worker'}
+
 def options(ctx):
     ctx.load('compiler_c')
     ctx.load('lv2')
@@ -23,14 +50,11 @@ def options(ctx):
     opt = ctx.get_option_group('Configuration options')
     autowaf.add_flags(
         opt,
-        {'test':         'Build unit tests',
-         'no-coverage':  'Do not use gcov for code coverage',
+        {'no-coverage':  'Do not use gcov for code coverage',
          'online-docs':  'Build documentation for web hosting',
          'no-plugins':   'Do not build example plugins',
          'copy-headers': 'Copy headers instead of linking to bundle'})
 
-    ctx.recurse('lv2/lv2plug.in/ns/lv2core')
-
 def configure(conf):
     autowaf.display_header('LV2 Configuration')
     try:
@@ -73,11 +97,8 @@ def configure(conf):
 
     autowaf.set_recursive()
 
-    conf.recurse('lv2/lv2plug.in/ns/lv2core')
-
-    conf.env.LV2_BUILD = ['lv2/lv2plug.in/ns/lv2core']
     if conf.env.BUILD_PLUGINS:
-        for i in conf.path.ant_glob('plugins/*', src=False, dir=True):
+        for i in conf.path.ant_glob('plugins/*.lv2', src=False, dir=True):
             try:
                 conf.recurse(i.srcpath())
                 conf.env.LV2_BUILD += [i.srcpath()]
@@ -87,7 +108,7 @@ def configure(conf):
     autowaf.display_summary(
         conf,
         {'Bundle directory': conf.env.LV2DIR,
-         'Copy (not link) headers': conf.env.COPY_HEADERS,
+         'Copy (not link) headers': bool(conf.env.COPY_HEADERS),
          'Version': VERSION})
 
 def chop_lv2_prefix(s):
@@ -106,10 +127,8 @@ def subst_file(template, output, dict):
     o.close()
 
 def specdirs(path):
-    return ([path.find_node('lv2/lv2plug.in/ns/lv2core')] +
-            path.ant_glob('plugins/*', dir=True) +
-            path.ant_glob('lv2/lv2plug.in/ns/ext/*', dir=True) +
-            path.ant_glob('lv2/lv2plug.in/ns/extensions/*', dir=True))
+    return (path.ant_glob('lv2/*', dir=True) +
+            path.ant_glob('plugins/*.lv2', dir=True))
 
 def ttl_files(path, specdir):
     def abspath(node):
@@ -135,7 +154,7 @@ def build_index(task):
     lv2  = rdflib.Namespace('http://lv2plug.in/ns/lv2core#')
     rdf  = rdflib.Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#')
 
-    model = load_ttl(['lv2/lv2plug.in/ns/lv2core/meta.ttl'])
+    model = load_ttl(['lv2/core/meta.ttl'])
 
     # Get date for this version, and list of all LV2 distributions
     proj  = rdflib.URIRef('http://lv2plug.in/ns/lv2')
@@ -191,30 +210,11 @@ def build_index(task):
                  '@DATE@' : date,
                  '@HISTORY@' : history})
 
-# Task for making a link in the build directory to a source file
-def link(task):
-    if not task.env.COPY_HEADERS and hasattr(os, 'symlink'):
-        func = os.symlink
-    else:
-        func = shutil.copy  # Symlinks unavailable, make a copy
-
-    try:
-        os.remove(task.outputs[0].abspath())  # Remove old target
-    except:
-        pass  # No old target, whatever
-
-    func(task.inputs[0].abspath(), task.outputs[0].abspath())
-
-def build_ext(bld, path):
-    name        = os.path.basename(path)
-    bundle_dir  = os.path.join(bld.env.LV2DIR, name + '.lv2')
-    include_dir = os.path.join(bld.env.INCLUDEDIR, path)
-
-    # Copy headers to URI-style include paths in build directory
-    for i in bld.path.ant_glob(path + '/*.h'):
-        bld(rule   = link,
-            source = i,
-            target = i.relpath())
+def build_spec(bld, path):
+    name            = os.path.basename(path)
+    bundle_dir      = os.path.join(bld.env.LV2DIR, name + '.lv2')
+    include_dir     = os.path.join(bld.env.INCLUDEDIR, path)
+    old_include_dir = os.path.join(bld.env.INCLUDEDIR, spec_map[name])
 
     # Build test program if applicable
     if bld.env.BUILD_TESTS and bld.path.find_node(path + '/%s-test.c' % name):
@@ -242,24 +242,22 @@ def build_ext(bld, path):
     # Install URI-like includes
     headers = bld.path.ant_glob(path + '/*.h')
     if headers:
-        if bld.env.COPY_HEADERS:
-            bld.install_files(include_dir, headers)
-        else:
-            bld.symlink_as(include_dir,
-                           os.path.relpath(bundle_dir,
-                                           os.path.dirname(include_dir)))
+        for d in [include_dir, old_include_dir]:
+            if bld.env.COPY_HEADERS:
+                bld.install_files(d, headers)
+            else:
+                bld.symlink_as(d,
+                               os.path.relpath(bundle_dir, os.path.dirname(d)))
 
 def build(bld):
-    exts = (bld.path.ant_glob('lv2/lv2plug.in/ns/ext/*', dir=True) +
-            bld.path.ant_glob('lv2/lv2plug.in/ns/extensions/*', dir=True))
+    specs = (bld.path.ant_glob('lv2/*', dir=True))
 
-    # Copy lv2.h to URI-style include path in build directory
-    lv2_h_paths = ['lv2/lv2plug.in/ns/lv2core/lv2.h',
-                   'lv2/lv2plug.in/ns/lv2core/lv2_util.h']
-    for path in lv2_h_paths:
-        bld(rule   = link,
-            source = bld.path.find_node(path),
-            target = bld.path.get_bld().make_node(path))
+    # Copy lv2.h to include directory for backwards compatibility
+    old_lv2_h_path = os.path.join(bld.env.INCLUDEDIR, 'lv2/lv2.h')
+    if bld.env.COPY_HEADERS:
+        bld.install_files(old_lv2_h_path, 'lv2/core/lv2.h')
+    else:
+        bld.symlink_as(old_lv2_h_path, 'core/lv2.h')
 
     # LV2 pkgconfig file
     bld(features     = 'subst',
@@ -279,12 +277,12 @@ def build(bld):
         LV2DIR       = bld.env.LV2DIR)
 
     # Build extensions
-    for i in exts:
-        build_ext(bld, i.srcpath())
+    for spec in specs:
+        build_spec(bld, spec.srcpath())
 
     # Build plugins
-    for i in bld.env.LV2_BUILD:
-        bld.recurse(i)
+    for plugin in bld.env.LV2_BUILD:
+        bld.recurse(plugin)
 
     # Install lv2specgen
     bld.install_files('${DATADIR}/lv2specgen/',
@@ -300,18 +298,20 @@ def build(bld):
 
     if bld.env.DOCS or bld.env.ONLINE_DOCS:
         # Prepare spec output directories
-        specs = exts + [bld.path.find_node('lv2/lv2plug.in/ns/lv2core')]
-        for i in specs:
+        for spec in specs:
             # Copy spec files to build dir
-            for f in bld.path.ant_glob(i.srcpath() + '/*.*'):
+            srcpath   = spec.srcpath()
+            name      = os.path.basename(srcpath)
+            full_path = spec_map[name]
+            path      = chop_lv2_prefix(full_path)
+            base      = full_path[len('lv2/lv2plug.in'):]
+            for f in bld.path.ant_glob(srcpath + '/*.*'):
+                target   = os.path.join(path, os.path.basename(f.srcpath()))
                 bld(features = 'subst',
                     is_copy  = True,
                     name     = 'copy',
                     source   = f,
-                    target   = chop_lv2_prefix(f.srcpath()))
-
-            base = i.srcpath()[len('lv2/lv2plug.in'):]
-            name = os.path.basename(i.srcpath())
+                    target   = target)
 
             # Generate .htaccess file
             if bld.env.ONLINE_DOCS:
@@ -322,7 +322,6 @@ def build(bld):
                     NAME         = name,
                     BASE         = base)
 
-
         # Copy stylesheets to build directory
         for i in ['style.css', 'pygments.css']:
             bld(features = 'subst',
@@ -342,29 +341,37 @@ def build(bld):
         bld.add_group()
 
         index_files = []
-        for i in specs:
+        for spec in specs:
             # Call lv2specgen to generate spec docs
-            name         = os.path.basename(i.srcpath())
+            srcpath      = spec.srcpath()
+            basename     = os.path.basename(srcpath)
+            full_path    = spec_map[basename]
+            name         = 'lv2core' if basename == 'core' else basename
+            ttl_name     = 'lv2.ttl' if basename == 'core' else name + '.ttl'
             index_file   = os.path.join('index_rows', name)
             index_files += [index_file]
-            root_path    = os.path.relpath('lv2/lv2plug.in/ns', name)
-            html_path    = '%s/%s.html' % (chop_lv2_prefix(i.srcpath()), name)
+            root_path    = os.path.relpath('lv2/lv2plug.in/ns', full_path)
+            html_path    = '%s/%s.html' % (chop_lv2_prefix(full_path), name)
             out_bundle   = os.path.dirname(html_path)
-            bld(rule = '../lv2specgen/lv2specgen.py --root=' + root_path +
-                ' --list-email=devel@lists.lv2plug.in'
-                ' --list-page=http://lists.lv2plug.in/listinfo.cgi/devel-lv2plug.in'
-                ' --style-uri=' + os.path.relpath('aux/style.css', out_bundle) +
-                ' --docdir=' + os.path.relpath('doc/html', os.path.dirname(html_path)) +
-                ' --tags=doc/tags' +
-                ' --index=' + index_file +
-                ' ${SRC} ${TGT}',
-                source = os.path.join(i.srcpath(), name + '.ttl'),
+
+            cmd = ('../lv2specgen/lv2specgen.py' +
+                   ' --root-uri=http://lv2plug.in/ns/ --root-path=' + root_path +
+                   ' --list-email=devel@lists.lv2plug.in'
+                   ' --list-page=http://lists.lv2plug.in/listinfo.cgi/devel-lv2plug.in'
+                   ' --style-uri=' + os.path.relpath('aux/style.css', out_bundle) +
+                   ' --docdir=' + os.path.relpath('doc/html', os.path.dirname(html_path)) +
+                   ' --tags=doc/tags' +
+                   ' --index=' + index_file +
+                   ' ${SRC} ${TGT}')
+
+            bld(rule   = cmd,
+                source = os.path.join(srcpath, name + '.ttl'),
                 target = [html_path, index_file])
 
             # Install documentation
             if not bld.env.ONLINE_DOCS:
-                base = chop_lv2_prefix(i.srcpath())
-                bld.install_files('${DOCDIR}/' + i.srcpath(),
+                base = chop_lv2_prefix(srcpath)
+                bld.install_files('${DOCDIR}/' + srcpath,
                                   bld.path.get_bld().ant_glob(base + '/*.html'))
 
         index_files.sort()
@@ -373,7 +380,7 @@ def build(bld):
         # Build extension index
         bld(rule   = build_index,
             name   = 'index',
-            source = ['lv2/lv2plug.in/ns/index.html.in'] + index_files,
+            source = ['doc/index.html.in'] + index_files,
             target = 'ns/index.html')
 
         # Install main documentation files
@@ -454,7 +461,7 @@ def posts(ctx):
                                        dev_dist = dev_dist)
 
     entries = autowaf.get_rdf_news('lv2',
-                                   ['lv2/lv2plug.in/ns/lv2core/meta.ttl'],
+                                   ['lv2/core/meta.ttl'],
                                    None,
                                    top_entries,
                                    dev_dist = dev_dist)