Move ns to lv2/ns so repository top level can be used as an include dir directly.

263 files changed, 120 insertions, 122 deletions

diff --git a/Doxyfile b/Doxyfile
index 89afeac..af4c8f9 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -565,33 +565,32 @@ WARN_LOGFILE           =
 # with spaces.
 
 INPUT =  \
-	ns/lv2core/lv2.h \
 	doc/mainpage.dox \
-	ns/ext/atom/atom-buffer.h \
-	ns/ext/atom/atom-helpers.h \
-	ns/ext/atom/atom.h \
-	ns/ext/atom/forge.h \
-	ns/ext/contexts/contexts.h \
-	ns/ext/data-access/data-access.h \
-	ns/ext/dynmanifest/dynmanifest.h \
-	ns/ext/event/event-helpers.h \
-	ns/ext/event/event.h \
-	ns/ext/files/files.h \
-	ns/ext/instance-access/instance-access.h \
-	ns/ext/osc/osc-print.h \
-	ns/ext/osc/osc.h \
-	ns/ext/pui/pui.h \
-	ns/ext/reference/reference.h \
-	ns/ext/resize-port/resize-port.h \
-	ns/ext/state/state.h \
-	ns/ext/string-port/string-port.h \
-	ns/ext/time/time.h \
-	ns/ext/ui-resize/ui-resize.h \
-	ns/ext/uri-map/uri-map.h \
-	ns/ext/uri-unmap/uri-unmap.h \
-	ns/ext/urid/urid.h \
-	ns/extensions/ui/ui.h \
-	ns/lv2core/lv2.h
+	lv2/ns/ext/atom/atom-buffer.h \
+	lv2/ns/ext/atom/atom-helpers.h \
+	lv2/ns/ext/atom/atom.h \
+	lv2/ns/ext/atom/forge.h \
+	lv2/ns/ext/contexts/contexts.h \
+	lv2/ns/ext/data-access/data-access.h \
+	lv2/ns/ext/dynmanifest/dynmanifest.h \
+	lv2/ns/ext/event/event-helpers.h \
+	lv2/ns/ext/event/event.h \
+	lv2/ns/ext/files/files.h \
+	lv2/ns/ext/instance-access/instance-access.h \
+	lv2/ns/ext/osc/osc-print.h \
+	lv2/ns/ext/osc/osc.h \
+	lv2/ns/ext/pui/pui.h \
+	lv2/ns/ext/reference/reference.h \
+	lv2/ns/ext/resize-port/resize-port.h \
+	lv2/ns/ext/state/state.h \
+	lv2/ns/ext/string-port/string-port.h \
+	lv2/ns/ext/time/time.h \
+	lv2/ns/ext/ui-resize/ui-resize.h \
+	lv2/ns/ext/uri-map/uri-map.h \
+	lv2/ns/ext/uri-unmap/uri-unmap.h \
+	lv2/ns/ext/urid/urid.h \
+	lv2/ns/extensions/ui/ui.h \
+	lv2/ns/lv2core/lv2.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, which is 
diff --git a/gendoc.py b/gendoc.py
index 3ed179e..cf2e340 100755
--- a/gendoc.py
+++ b/gendoc.py
@@ -18,7 +18,7 @@ except:
     pass
 
 # Copy bundles (less build files) to build directory
-shutil.copytree('ns', 'build/ns',
+shutil.copytree('lv2/ns', 'build/ns',
                 ignore=shutil.ignore_patterns('.*', 'waf', 'wscript', '*.in'))
 
 # Copy stylesheet to build directory
@@ -44,8 +44,7 @@ rdf  = rdflib.Namespace('http://www.w3.org/1999/02/22-rdf-syntax-ns#')
 devnull = open(os.devnull, 'w')
 
 # Generate code (headers) documentation
-print('** Generating header documentation')
-print(' * Calling doxygen in ' + os.getcwd())
+print('## Generating header documentation with doxygen ##')
 subprocess.call('doxygen', stdout=devnull)
 
 def rescue_tags(in_path, out_path):
@@ -97,14 +96,14 @@ def subst_file(template, output, dict):
     i.close()
     o.close()
 
-print('** Generating core documentation')
-
 print("Entering directory `%s'" % os.path.abspath('build'))
 oldcwd = os.getcwd()
 os.chdir('build')
 
 extensions = []
 
+print('\n## Generating specification documentation with lv2specgen ##')
+
 for root, dirs, files in os.walk('ns'):
     if '.svn' in dirs:
         dirs.remove('.svn')
@@ -123,7 +122,7 @@ for root, dirs, files in os.walk('ns'):
         print('warning: extension %s has no %s.ttl file' % (root, root))
         continue
 
-    print(" * Generating %s documentation" % outdir)
+    print(' * %s' % outdir)
 
     try:
         model = rdflib.ConjunctiveGraph()
@@ -222,11 +221,11 @@ extensions.sort()
 for i in extensions:
     index_rows += i + '\n'
 
-subst_file('../ns/index.html.in', 'ns/index.html',
+subst_file('../lv2/ns/index.html.in', 'ns/index.html',
            { '@ROWS@': index_rows,
              '@TIME@': datetime.datetime.utcnow().strftime('%F %H:%M UTC') })
            
-print("Leaving directory `%s'" % os.path.abspath('build'))
+print("\nLeaving directory `%s'" % os.path.abspath('build'))
 os.chdir(oldcwd)
 
 devnull.close()
diff --git a/ns/ext/atom/atom-buffer.h b/lv2/ns/ext/atom/atom-buffer.h
index f4b90dd..f4b90dd 100644
--- a/ns/ext/atom/atom-buffer.h
+++ b/lv2/ns/ext/atom/atom-buffer.h
diff --git a/ns/ext/atom/atom-helpers.h b/lv2/ns/ext/atom/atom-helpers.h
index 4e51c89..4e51c89 100644
--- a/ns/ext/atom/atom-helpers.h
+++ b/lv2/ns/ext/atom/atom-helpers.h
diff --git a/ns/ext/atom/atom.h b/lv2/ns/ext/atom/atom.h
index 39d721c..39d721c 100644
--- a/ns/ext/atom/atom.h
+++ b/lv2/ns/ext/atom/atom.h
diff --git a/ns/ext/atom/atom.ttl b/lv2/ns/ext/atom/atom.ttl
index 1b2e265..1b2e265 100644
--- a/ns/ext/atom/atom.ttl
+++ b/lv2/ns/ext/atom/atom.ttl
diff --git a/lv2/ns/ext/atom/ext.pc.in b/lv2/ns/ext/atom/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/atom/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/atom/forge.h b/lv2/ns/ext/atom/forge.h
index e8f5d40..e8f5d40 100644
--- a/ns/ext/atom/forge.h
+++ b/lv2/ns/ext/atom/forge.h
diff --git a/ns/ext/atom/manifest.ttl b/lv2/ns/ext/atom/manifest.ttl
index adb10e5..adb10e5 100644
--- a/ns/ext/atom/manifest.ttl
+++ b/lv2/ns/ext/atom/manifest.ttl
diff --git a/lv2/ns/ext/atom/waf b/lv2/ns/ext/atom/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/atom/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/atom/wscript b/lv2/ns/ext/atom/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/atom/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/contexts/contexts.h b/lv2/ns/ext/contexts/contexts.h
index f49b474..f49b474 100644
--- a/ns/ext/contexts/contexts.h
+++ b/lv2/ns/ext/contexts/contexts.h
diff --git a/ns/ext/contexts/contexts.ttl b/lv2/ns/ext/contexts/contexts.ttl
index c56c649..c56c649 100644
--- a/ns/ext/contexts/contexts.ttl
+++ b/lv2/ns/ext/contexts/contexts.ttl
diff --git a/lv2/ns/ext/contexts/ext.pc.in b/lv2/ns/ext/contexts/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/contexts/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/contexts/manifest.ttl b/lv2/ns/ext/contexts/manifest.ttl
index d2cc036..d2cc036 100644
--- a/ns/ext/contexts/manifest.ttl
+++ b/lv2/ns/ext/contexts/manifest.ttl
diff --git a/ns/ext/contexts/test.c b/lv2/ns/ext/contexts/test.c
index ca41a10..ca41a10 100644
--- a/ns/ext/contexts/test.c
+++ b/lv2/ns/ext/contexts/test.c
diff --git a/lv2/ns/ext/contexts/waf b/lv2/ns/ext/contexts/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/contexts/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/contexts/wscript b/lv2/ns/ext/contexts/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/contexts/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/cv-port/cv-port.ttl b/lv2/ns/ext/cv-port/cv-port.ttl
index f49024b..f49024b 100644
--- a/ns/ext/cv-port/cv-port.ttl
+++ b/lv2/ns/ext/cv-port/cv-port.ttl
diff --git a/lv2/ns/ext/cv-port/ext.pc.in b/lv2/ns/ext/cv-port/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/cv-port/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/cv-port/manifest.ttl b/lv2/ns/ext/cv-port/manifest.ttl
index e5fa145..e5fa145 100644
--- a/ns/ext/cv-port/manifest.ttl
+++ b/lv2/ns/ext/cv-port/manifest.ttl
diff --git a/lv2/ns/ext/cv-port/waf b/lv2/ns/ext/cv-port/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/cv-port/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/cv-port/wscript b/lv2/ns/ext/cv-port/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/cv-port/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/data-access/data-access.h b/lv2/ns/ext/data-access/data-access.h
index fac6974..fac6974 100644
--- a/ns/ext/data-access/data-access.h
+++ b/lv2/ns/ext/data-access/data-access.h
diff --git a/ns/ext/data-access/data-access.ttl b/lv2/ns/ext/data-access/data-access.ttl
index 1f2ec04..1f2ec04 100644
--- a/ns/ext/data-access/data-access.ttl
+++ b/lv2/ns/ext/data-access/data-access.ttl
diff --git a/lv2/ns/ext/data-access/ext.pc.in b/lv2/ns/ext/data-access/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/data-access/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/data-access/manifest.ttl b/lv2/ns/ext/data-access/manifest.ttl
index f7ccd9d..f7ccd9d 100644
--- a/ns/ext/data-access/manifest.ttl
+++ b/lv2/ns/ext/data-access/manifest.ttl
diff --git a/lv2/ns/ext/data-access/waf b/lv2/ns/ext/data-access/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/data-access/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/data-access/wscript b/lv2/ns/ext/data-access/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/data-access/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/dynmanifest/dynmanifest.h b/lv2/ns/ext/dynmanifest/dynmanifest.h
index 56d829e..56d829e 100644
--- a/ns/ext/dynmanifest/dynmanifest.h
+++ b/lv2/ns/ext/dynmanifest/dynmanifest.h
diff --git a/ns/ext/dynmanifest/dynmanifest.ttl b/lv2/ns/ext/dynmanifest/dynmanifest.ttl
index 591cb11..591cb11 100644
--- a/ns/ext/dynmanifest/dynmanifest.ttl
+++ b/lv2/ns/ext/dynmanifest/dynmanifest.ttl
diff --git a/lv2/ns/ext/dynmanifest/ext.pc.in b/lv2/ns/ext/dynmanifest/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/dynmanifest/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl b/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
index f47c381..f47c381 100644
--- a/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
+++ b/lv2/ns/ext/dynmanifest/lv2-dynmanifest.doap.ttl
diff --git a/ns/ext/dynmanifest/manifest.ttl b/lv2/ns/ext/dynmanifest/manifest.ttl
index 6718092..6718092 100644
--- a/ns/ext/dynmanifest/manifest.ttl
+++ b/lv2/ns/ext/dynmanifest/manifest.ttl
diff --git a/lv2/ns/ext/dynmanifest/waf b/lv2/ns/ext/dynmanifest/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/dynmanifest/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/dynmanifest/wscript b/lv2/ns/ext/dynmanifest/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/dynmanifest/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/event/event-helpers.h b/lv2/ns/ext/event/event-helpers.h
index 75ba14b..75ba14b 100644
--- a/ns/ext/event/event-helpers.h
+++ b/lv2/ns/ext/event/event-helpers.h
diff --git a/ns/ext/event/event.h b/lv2/ns/ext/event/event.h
index 2c340ba..2c340ba 100644
--- a/ns/ext/event/event.h
+++ b/lv2/ns/ext/event/event.h
diff --git a/ns/ext/event/event.ttl b/lv2/ns/ext/event/event.ttl
index d207a7a..d207a7a 100644
--- a/ns/ext/event/event.ttl
+++ b/lv2/ns/ext/event/event.ttl
diff --git a/lv2/ns/ext/event/ext.pc.in b/lv2/ns/ext/event/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/event/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/event/manifest.ttl b/lv2/ns/ext/event/manifest.ttl
index 2b1ff43..2b1ff43 100644
--- a/ns/ext/event/manifest.ttl
+++ b/lv2/ns/ext/event/manifest.ttl
diff --git a/lv2/ns/ext/event/waf b/lv2/ns/ext/event/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/event/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/event/wscript b/lv2/ns/ext/event/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/event/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/files/ext.pc.in b/lv2/ns/ext/files/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/files/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/files/files.h b/lv2/ns/ext/files/files.h
index 623587a..623587a 100644
--- a/ns/ext/files/files.h
+++ b/lv2/ns/ext/files/files.h
diff --git a/ns/ext/files/files.ttl b/lv2/ns/ext/files/files.ttl
index d3ff8a5..d3ff8a5 100644
--- a/ns/ext/files/files.ttl
+++ b/lv2/ns/ext/files/files.ttl
diff --git a/ns/ext/files/manifest.ttl b/lv2/ns/ext/files/manifest.ttl
index d0233c4..d0233c4 100644
--- a/ns/ext/files/manifest.ttl
+++ b/lv2/ns/ext/files/manifest.ttl
diff --git a/lv2/ns/ext/files/waf b/lv2/ns/ext/files/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/files/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/files/wscript b/lv2/ns/ext/files/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/files/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/host-info/ext.pc.in b/lv2/ns/ext/host-info/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/host-info/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/host-info/host-info.ttl b/lv2/ns/ext/host-info/host-info.ttl
index 127f4cc..127f4cc 100644
--- a/ns/ext/host-info/host-info.ttl
+++ b/lv2/ns/ext/host-info/host-info.ttl
diff --git a/ns/ext/host-info/manifest.ttl b/lv2/ns/ext/host-info/manifest.ttl
index ae1e097..ae1e097 100644
--- a/ns/ext/host-info/manifest.ttl
+++ b/lv2/ns/ext/host-info/manifest.ttl
diff --git a/lv2/ns/ext/host-info/waf b/lv2/ns/ext/host-info/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/host-info/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/host-info/wscript b/lv2/ns/ext/host-info/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/host-info/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/instance-access/ext.pc.in b/lv2/ns/ext/instance-access/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/instance-access/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/instance-access/instance-access.h b/lv2/ns/ext/instance-access/instance-access.h
index 7e18ee4..7e18ee4 100644
--- a/ns/ext/instance-access/instance-access.h
+++ b/lv2/ns/ext/instance-access/instance-access.h
diff --git a/ns/ext/instance-access/instance-access.ttl b/lv2/ns/ext/instance-access/instance-access.ttl
index f3d1a42..f3d1a42 100644
--- a/ns/ext/instance-access/instance-access.ttl
+++ b/lv2/ns/ext/instance-access/instance-access.ttl
diff --git a/ns/ext/instance-access/manifest.ttl b/lv2/ns/ext/instance-access/manifest.ttl
index d6412c5..d6412c5 100644
--- a/ns/ext/instance-access/manifest.ttl
+++ b/lv2/ns/ext/instance-access/manifest.ttl
diff --git a/lv2/ns/ext/instance-access/waf b/lv2/ns/ext/instance-access/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/instance-access/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/instance-access/wscript b/lv2/ns/ext/instance-access/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/instance-access/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/midi/ext.pc.in b/lv2/ns/ext/midi/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/midi/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/midi/manifest.ttl b/lv2/ns/ext/midi/manifest.ttl
index a8e194e..a8e194e 100644
--- a/ns/ext/midi/manifest.ttl
+++ b/lv2/ns/ext/midi/manifest.ttl
diff --git a/ns/ext/midi/midi.ttl b/lv2/ns/ext/midi/midi.ttl
index 0b66f42..0b66f42 100644
--- a/ns/ext/midi/midi.ttl
+++ b/lv2/ns/ext/midi/midi.ttl
diff --git a/lv2/ns/ext/midi/waf b/lv2/ns/ext/midi/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/midi/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/midi/wscript b/lv2/ns/ext/midi/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/midi/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/osc/ext.pc.in b/lv2/ns/ext/osc/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/osc/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/osc/lv2_osc.c b/lv2/ns/ext/osc/lv2_osc.c
index afea2c9..afea2c9 100644
--- a/ns/ext/osc/lv2_osc.c
+++ b/lv2/ns/ext/osc/lv2_osc.c
diff --git a/ns/ext/osc/lv2_osc_print.c b/lv2/ns/ext/osc/lv2_osc_print.c
index 5282d46..5282d46 100644
--- a/ns/ext/osc/lv2_osc_print.c
+++ b/lv2/ns/ext/osc/lv2_osc_print.c
diff --git a/ns/ext/osc/lv2_osc_test.c b/lv2/ns/ext/osc/lv2_osc_test.c
index 3f76d41..3f76d41 100644
--- a/ns/ext/osc/lv2_osc_test.c
+++ b/lv2/ns/ext/osc/lv2_osc_test.c
diff --git a/ns/ext/osc/manifest.ttl b/lv2/ns/ext/osc/manifest.ttl
index 7209b05..7209b05 100644
--- a/ns/ext/osc/manifest.ttl
+++ b/lv2/ns/ext/osc/manifest.ttl
diff --git a/ns/ext/osc/osc-print.h b/lv2/ns/ext/osc/osc-print.h
index ceebbf7..ceebbf7 100644
--- a/ns/ext/osc/osc-print.h
+++ b/lv2/ns/ext/osc/osc-print.h
diff --git a/ns/ext/osc/osc.h b/lv2/ns/ext/osc/osc.h
index 05e39cc..05e39cc 100644
--- a/ns/ext/osc/osc.h
+++ b/lv2/ns/ext/osc/osc.h
diff --git a/ns/ext/osc/osc.ttl b/lv2/ns/ext/osc/osc.ttl
index c83a69d..c83a69d 100644
--- a/ns/ext/osc/osc.ttl
+++ b/lv2/ns/ext/osc/osc.ttl
diff --git a/lv2/ns/ext/osc/waf b/lv2/ns/ext/osc/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/osc/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/osc/wscript b/lv2/ns/ext/osc/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/osc/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/parameter/ext.pc.in b/lv2/ns/ext/parameter/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/parameter/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/parameter/manifest.ttl b/lv2/ns/ext/parameter/manifest.ttl
index d7af7ff..d7af7ff 100644
--- a/ns/ext/parameter/manifest.ttl
+++ b/lv2/ns/ext/parameter/manifest.ttl
diff --git a/ns/ext/parameter/parameter.ttl b/lv2/ns/ext/parameter/parameter.ttl
index 191aa81..191aa81 100644
--- a/ns/ext/parameter/parameter.ttl
+++ b/lv2/ns/ext/parameter/parameter.ttl
diff --git a/lv2/ns/ext/parameter/waf b/lv2/ns/ext/parameter/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/parameter/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/parameter/wscript b/lv2/ns/ext/parameter/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/parameter/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/port-groups/ext.pc.in b/lv2/ns/ext/port-groups/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/port-groups/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/port-groups/manifest.ttl b/lv2/ns/ext/port-groups/manifest.ttl
index ff4205b..ff4205b 100644
--- a/ns/ext/port-groups/manifest.ttl
+++ b/lv2/ns/ext/port-groups/manifest.ttl
diff --git a/ns/ext/port-groups/port-groups.ttl b/lv2/ns/ext/port-groups/port-groups.ttl
index 862d52c..862d52c 100644
--- a/ns/ext/port-groups/port-groups.ttl
+++ b/lv2/ns/ext/port-groups/port-groups.ttl
diff --git a/lv2/ns/ext/port-groups/waf b/lv2/ns/ext/port-groups/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/port-groups/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/port-groups/wscript b/lv2/ns/ext/port-groups/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/port-groups/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/port-props/ext.pc.in b/lv2/ns/ext/port-props/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/port-props/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/port-props/manifest.ttl b/lv2/ns/ext/port-props/manifest.ttl
index b4afe2f..b4afe2f 100644
--- a/ns/ext/port-props/manifest.ttl
+++ b/lv2/ns/ext/port-props/manifest.ttl
diff --git a/ns/ext/port-props/port-props.ttl b/lv2/ns/ext/port-props/port-props.ttl
index d811959..d811959 100644
--- a/ns/ext/port-props/port-props.ttl
+++ b/lv2/ns/ext/port-props/port-props.ttl
diff --git a/lv2/ns/ext/port-props/waf b/lv2/ns/ext/port-props/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/port-props/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/port-props/wscript b/lv2/ns/ext/port-props/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/port-props/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/presets/ext.pc.in b/lv2/ns/ext/presets/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/presets/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/presets/manifest.ttl b/lv2/ns/ext/presets/manifest.ttl
index 51985ab..51985ab 100644
--- a/ns/ext/presets/manifest.ttl
+++ b/lv2/ns/ext/presets/manifest.ttl
diff --git a/ns/ext/presets/presets.ttl b/lv2/ns/ext/presets/presets.ttl
index ebe6d0f..ebe6d0f 100644
--- a/ns/ext/presets/presets.ttl
+++ b/lv2/ns/ext/presets/presets.ttl
diff --git a/lv2/ns/ext/presets/waf b/lv2/ns/ext/presets/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/presets/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/presets/wscript b/lv2/ns/ext/presets/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/presets/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/pui/ext.pc.in b/lv2/ns/ext/pui/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/pui/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/pui/manifest.ttl b/lv2/ns/ext/pui/manifest.ttl
index 1229118..1229118 100644
--- a/ns/ext/pui/manifest.ttl
+++ b/lv2/ns/ext/pui/manifest.ttl
diff --git a/ns/ext/pui/pui.h b/lv2/ns/ext/pui/pui.h
index caa7deb..caa7deb 100644
--- a/ns/ext/pui/pui.h
+++ b/lv2/ns/ext/pui/pui.h
diff --git a/ns/ext/pui/pui.ttl b/lv2/ns/ext/pui/pui.ttl
index c035e56..c035e56 100644
--- a/ns/ext/pui/pui.ttl
+++ b/lv2/ns/ext/pui/pui.ttl
diff --git a/lv2/ns/ext/pui/waf b/lv2/ns/ext/pui/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/pui/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/pui/wscript b/lv2/ns/ext/pui/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/pui/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/reference/ext.pc.in b/lv2/ns/ext/reference/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/reference/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/reference/manifest.ttl b/lv2/ns/ext/reference/manifest.ttl
index e25c54d..e25c54d 100644
--- a/ns/ext/reference/manifest.ttl
+++ b/lv2/ns/ext/reference/manifest.ttl
diff --git a/ns/ext/reference/reference.h b/lv2/ns/ext/reference/reference.h
index 26ef4c3..26ef4c3 100644
--- a/ns/ext/reference/reference.h
+++ b/lv2/ns/ext/reference/reference.h
diff --git a/ns/ext/reference/reference.ttl b/lv2/ns/ext/reference/reference.ttl
index 1e030ee..1e030ee 100644
--- a/ns/ext/reference/reference.ttl
+++ b/lv2/ns/ext/reference/reference.ttl
diff --git a/lv2/ns/ext/reference/waf b/lv2/ns/ext/reference/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/reference/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/reference/wscript b/lv2/ns/ext/reference/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/reference/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/resize-port/ext.pc.in b/lv2/ns/ext/resize-port/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/resize-port/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/resize-port/manifest.ttl b/lv2/ns/ext/resize-port/manifest.ttl
index 37d1b42..37d1b42 100644
--- a/ns/ext/resize-port/manifest.ttl
+++ b/lv2/ns/ext/resize-port/manifest.ttl
diff --git a/ns/ext/resize-port/resize-port.h b/lv2/ns/ext/resize-port/resize-port.h
index 7f014a3..7f014a3 100644
--- a/ns/ext/resize-port/resize-port.h
+++ b/lv2/ns/ext/resize-port/resize-port.h
diff --git a/ns/ext/resize-port/resize-port.ttl b/lv2/ns/ext/resize-port/resize-port.ttl
index baa1f7f..baa1f7f 100644
--- a/ns/ext/resize-port/resize-port.ttl
+++ b/lv2/ns/ext/resize-port/resize-port.ttl
diff --git a/lv2/ns/ext/resize-port/waf b/lv2/ns/ext/resize-port/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/resize-port/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/resize-port/wscript b/lv2/ns/ext/resize-port/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/resize-port/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/state/ext.pc.in b/lv2/ns/ext/state/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/state/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/state/manifest.ttl b/lv2/ns/ext/state/manifest.ttl
index 7894a22..7894a22 100644
--- a/ns/ext/state/manifest.ttl
+++ b/lv2/ns/ext/state/manifest.ttl
diff --git a/ns/ext/state/state.h b/lv2/ns/ext/state/state.h
index 4e1c28a..4e1c28a 100644
--- a/ns/ext/state/state.h
+++ b/lv2/ns/ext/state/state.h
diff --git a/ns/ext/state/state.ttl b/lv2/ns/ext/state/state.ttl
index c79188e..c79188e 100644
--- a/ns/ext/state/state.ttl
+++ b/lv2/ns/ext/state/state.ttl
diff --git a/lv2/ns/ext/state/waf b/lv2/ns/ext/state/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/state/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/state/wscript b/lv2/ns/ext/state/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/state/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/string-port/ext.pc.in b/lv2/ns/ext/string-port/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/string-port/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/string-port/manifest.ttl b/lv2/ns/ext/string-port/manifest.ttl
index d0e618e..d0e618e 100644
--- a/ns/ext/string-port/manifest.ttl
+++ b/lv2/ns/ext/string-port/manifest.ttl
diff --git a/ns/ext/string-port/string-port.h b/lv2/ns/ext/string-port/string-port.h
index e7fc8c7..e7fc8c7 100644
--- a/ns/ext/string-port/string-port.h
+++ b/lv2/ns/ext/string-port/string-port.h
diff --git a/ns/ext/string-port/string-port.ttl b/lv2/ns/ext/string-port/string-port.ttl
index f36fa7a..f36fa7a 100644
--- a/ns/ext/string-port/string-port.ttl
+++ b/lv2/ns/ext/string-port/string-port.ttl
diff --git a/lv2/ns/ext/string-port/waf b/lv2/ns/ext/string-port/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/string-port/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/string-port/wscript b/lv2/ns/ext/string-port/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/string-port/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/time/ext.pc.in b/lv2/ns/ext/time/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/time/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/time/manifest.ttl b/lv2/ns/ext/time/manifest.ttl
index 2657388..2657388 100644
--- a/ns/ext/time/manifest.ttl
+++ b/lv2/ns/ext/time/manifest.ttl
diff --git a/ns/ext/time/time.h b/lv2/ns/ext/time/time.h
index f3b2e77..f3b2e77 100644
--- a/ns/ext/time/time.h
+++ b/lv2/ns/ext/time/time.h
diff --git a/ns/ext/time/time.ttl b/lv2/ns/ext/time/time.ttl
index 40bfdbb..40bfdbb 100644
--- a/ns/ext/time/time.ttl
+++ b/lv2/ns/ext/time/time.ttl
diff --git a/lv2/ns/ext/time/waf b/lv2/ns/ext/time/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/time/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/time/wscript b/lv2/ns/ext/time/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/time/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/ui-resize/ext.pc.in b/lv2/ns/ext/ui-resize/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/ui-resize/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/ui-resize/manifest.ttl b/lv2/ns/ext/ui-resize/manifest.ttl
index ca5cdf9..ca5cdf9 100644
--- a/ns/ext/ui-resize/manifest.ttl
+++ b/lv2/ns/ext/ui-resize/manifest.ttl
diff --git a/ns/ext/ui-resize/ui-resize.h b/lv2/ns/ext/ui-resize/ui-resize.h
index cf5ccc6..cf5ccc6 100644
--- a/ns/ext/ui-resize/ui-resize.h
+++ b/lv2/ns/ext/ui-resize/ui-resize.h
diff --git a/ns/ext/ui-resize/ui-resize.ttl b/lv2/ns/ext/ui-resize/ui-resize.ttl
index 5e2a5a8..5e2a5a8 100644
--- a/ns/ext/ui-resize/ui-resize.ttl
+++ b/lv2/ns/ext/ui-resize/ui-resize.ttl
diff --git a/lv2/ns/ext/ui-resize/waf b/lv2/ns/ext/ui-resize/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/ui-resize/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/ui-resize/wscript b/lv2/ns/ext/ui-resize/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/ui-resize/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/uri-map/ext.pc.in b/lv2/ns/ext/uri-map/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/uri-map/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/uri-map/manifest.ttl b/lv2/ns/ext/uri-map/manifest.ttl
index eb78686..eb78686 100644
--- a/ns/ext/uri-map/manifest.ttl
+++ b/lv2/ns/ext/uri-map/manifest.ttl
diff --git a/ns/ext/uri-map/uri-map.h b/lv2/ns/ext/uri-map/uri-map.h
index 6767cd1..6767cd1 100644
--- a/ns/ext/uri-map/uri-map.h
+++ b/lv2/ns/ext/uri-map/uri-map.h
diff --git a/ns/ext/uri-map/uri-map.ttl b/lv2/ns/ext/uri-map/uri-map.ttl
index b0a5399..b0a5399 100644
--- a/ns/ext/uri-map/uri-map.ttl
+++ b/lv2/ns/ext/uri-map/uri-map.ttl
diff --git a/lv2/ns/ext/uri-map/waf b/lv2/ns/ext/uri-map/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/uri-map/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/uri-map/wscript b/lv2/ns/ext/uri-map/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/uri-map/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/uri-unmap/ext.pc.in b/lv2/ns/ext/uri-unmap/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/uri-unmap/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/uri-unmap/manifest.ttl b/lv2/ns/ext/uri-unmap/manifest.ttl
index 217e7b6..217e7b6 100644
--- a/ns/ext/uri-unmap/manifest.ttl
+++ b/lv2/ns/ext/uri-unmap/manifest.ttl
diff --git a/ns/ext/uri-unmap/uri-unmap.h b/lv2/ns/ext/uri-unmap/uri-unmap.h
index d6cb900..d6cb900 100644
--- a/ns/ext/uri-unmap/uri-unmap.h
+++ b/lv2/ns/ext/uri-unmap/uri-unmap.h
diff --git a/ns/ext/uri-unmap/uri-unmap.ttl b/lv2/ns/ext/uri-unmap/uri-unmap.ttl
index 053bb37..053bb37 100644
--- a/ns/ext/uri-unmap/uri-unmap.ttl
+++ b/lv2/ns/ext/uri-unmap/uri-unmap.ttl
diff --git a/lv2/ns/ext/uri-unmap/waf b/lv2/ns/ext/uri-unmap/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/uri-unmap/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/uri-unmap/wscript b/lv2/ns/ext/uri-unmap/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/uri-unmap/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/ext/urid/ext.pc.in b/lv2/ns/ext/urid/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/ext/urid/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/urid/manifest.ttl b/lv2/ns/ext/urid/manifest.ttl
index c77aff6..c77aff6 100644
--- a/ns/ext/urid/manifest.ttl
+++ b/lv2/ns/ext/urid/manifest.ttl
diff --git a/ns/ext/urid/urid.h b/lv2/ns/ext/urid/urid.h
index d36d0dd..d36d0dd 100644
--- a/ns/ext/urid/urid.h
+++ b/lv2/ns/ext/urid/urid.h
diff --git a/ns/ext/urid/urid.ttl b/lv2/ns/ext/urid/urid.ttl
index a87b368..a87b368 100644
--- a/ns/ext/urid/urid.ttl
+++ b/lv2/ns/ext/urid/urid.ttl
diff --git a/lv2/ns/ext/urid/waf b/lv2/ns/ext/urid/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/ext/urid/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/ext/urid/wscript b/lv2/ns/ext/urid/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/ext/urid/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/extensions/ui/ext.pc.in b/lv2/ns/extensions/ui/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/extensions/ui/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/extensions/ui/lv2-ui.doap.ttl b/lv2/ns/extensions/ui/lv2-ui.doap.ttl
index 44b135d..44b135d 100644
--- a/ns/extensions/ui/lv2-ui.doap.ttl
+++ b/lv2/ns/extensions/ui/lv2-ui.doap.ttl
diff --git a/ns/extensions/ui/manifest.ttl b/lv2/ns/extensions/ui/manifest.ttl
index febbaad..febbaad 100644
--- a/ns/extensions/ui/manifest.ttl
+++ b/lv2/ns/extensions/ui/manifest.ttl
diff --git a/ns/extensions/ui/ui.h b/lv2/ns/extensions/ui/ui.h
index 6d64a0d..6d64a0d 100644
--- a/ns/extensions/ui/ui.h
+++ b/lv2/ns/extensions/ui/ui.h
diff --git a/ns/extensions/ui/ui.ttl b/lv2/ns/extensions/ui/ui.ttl
index f62569a..f62569a 100644
--- a/ns/extensions/ui/ui.ttl
+++ b/lv2/ns/extensions/ui/ui.ttl
diff --git a/lv2/ns/extensions/ui/waf b/lv2/ns/extensions/ui/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/extensions/ui/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/extensions/ui/wscript b/lv2/ns/extensions/ui/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/extensions/ui/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/lv2/ns/extensions/units/ext.pc.in b/lv2/ns/extensions/units/ext.pc.in
new file mode 120000
index 0000000..82b50df
--- /dev/null
+++ b/lv2/ns/extensions/units/ext.pc.in
@@ -0,0 +1 @@
+../../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/extensions/units/manifest.ttl b/lv2/ns/extensions/units/manifest.ttl
index fb5e949..fb5e949 100644
--- a/ns/extensions/units/manifest.ttl
+++ b/lv2/ns/extensions/units/manifest.ttl
diff --git a/ns/extensions/units/units.ttl b/lv2/ns/extensions/units/units.ttl
index ab33723..ab33723 100644
--- a/ns/extensions/units/units.ttl
+++ b/lv2/ns/extensions/units/units.ttl
diff --git a/lv2/ns/extensions/units/waf b/lv2/ns/extensions/units/waf
new file mode 120000
index 0000000..b955110
--- /dev/null
+++ b/lv2/ns/extensions/units/waf
@@ -0,0 +1 @@
+../../../../waf
\ No newline at end of file
diff --git a/lv2/ns/extensions/units/wscript b/lv2/ns/extensions/units/wscript
new file mode 120000
index 0000000..ec20a77
--- /dev/null
+++ b/lv2/ns/extensions/units/wscript
@@ -0,0 +1 @@
+../../../../ext.wscript
\ No newline at end of file
diff --git a/ns/index.html.in b/lv2/ns/index.html.in
index 4863cb2..4863cb2 100644
--- a/ns/index.html.in
+++ b/lv2/ns/index.html.in
diff --git a/ns/lv2core/AUTHORS b/lv2/ns/lv2core/AUTHORS
index 64febf8..64febf8 100644
--- a/ns/lv2core/AUTHORS
+++ b/lv2/ns/lv2core/AUTHORS
diff --git a/ns/lv2core/COPYING b/lv2/ns/lv2core/COPYING
index c46d5dd..c46d5dd 100644
--- a/ns/lv2core/COPYING
+++ b/lv2/ns/lv2core/COPYING
diff --git a/ns/lv2core/ChangeLog b/lv2/ns/lv2core/ChangeLog
index ec7962a..ec7962a 100644
--- a/ns/lv2core/ChangeLog
+++ b/lv2/ns/lv2core/ChangeLog
diff --git a/ns/lv2core/Doxyfile b/lv2/ns/lv2core/Doxyfile
index 23836b8..23836b8 100644
--- a/ns/lv2core/Doxyfile
+++ b/lv2/ns/lv2core/Doxyfile
diff --git a/ns/lv2core/INSTALL b/lv2/ns/lv2core/INSTALL
index c9c49dc..c9c49dc 100644
--- a/ns/lv2core/INSTALL
+++ b/lv2/ns/lv2core/INSTALL
diff --git a/ns/lv2core/README b/lv2/ns/lv2core/README
index 845bf40..845bf40 100644
--- a/ns/lv2core/README
+++ b/lv2/ns/lv2core/README
diff --git a/ns/lv2core/lv2.h b/lv2/ns/lv2core/lv2.h
index ce55d45..ce55d45 100644
--- a/ns/lv2core/lv2.h
+++ b/lv2/ns/lv2core/lv2.h
diff --git a/ns/lv2core/lv2core.doap.ttl b/lv2/ns/lv2core/lv2core.doap.ttl
index f01eadb..f01eadb 100644
--- a/ns/lv2core/lv2core.doap.ttl
+++ b/lv2/ns/lv2core/lv2core.doap.ttl
diff --git a/ns/lv2core/lv2core.pc.in b/lv2/ns/lv2core/lv2core.pc.in
index bcaa501..bcaa501 100644
--- a/ns/lv2core/lv2core.pc.in
+++ b/lv2/ns/lv2core/lv2core.pc.in
diff --git a/ns/lv2core/lv2core.ttl b/lv2/ns/lv2core/lv2core.ttl
index 0ab56c5..0ab56c5 100644
--- a/ns/lv2core/lv2core.ttl
+++ b/lv2/ns/lv2core/lv2core.ttl
diff --git a/ns/lv2core/manifest.ttl b/lv2/ns/lv2core/manifest.ttl
index cf23e82..cf23e82 100644
--- a/ns/lv2core/manifest.ttl
+++ b/lv2/ns/lv2core/manifest.ttl
diff --git a/ns/lv2core/waf b/lv2/ns/lv2core/waf
index ef338a3..ef338a3 100755
--- a/ns/lv2core/waf
+++ b/lv2/ns/lv2core/waf
diff --git a/ns/lv2core/wscript b/lv2/ns/lv2core/wscript
index d57985f..d57985f 100644
--- a/ns/lv2core/wscript
+++ b/lv2/ns/lv2core/wscript
diff --git a/ns/ext/atom/ext.pc.in b/ns/ext/atom/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/atom/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/atom/waf b/ns/ext/atom/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/atom/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/atom/wscript b/ns/ext/atom/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/atom/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/contexts/ext.pc.in b/ns/ext/contexts/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/contexts/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/contexts/waf b/ns/ext/contexts/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/contexts/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/contexts/wscript b/ns/ext/contexts/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/contexts/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/cv-port/ext.pc.in b/ns/ext/cv-port/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/cv-port/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/cv-port/waf b/ns/ext/cv-port/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/cv-port/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/cv-port/wscript b/ns/ext/cv-port/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/cv-port/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/data-access/ext.pc.in b/ns/ext/data-access/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/data-access/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/data-access/waf b/ns/ext/data-access/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/data-access/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/data-access/wscript b/ns/ext/data-access/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/data-access/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/dynmanifest/ext.pc.in b/ns/ext/dynmanifest/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/dynmanifest/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/dynmanifest/waf b/ns/ext/dynmanifest/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/dynmanifest/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/dynmanifest/wscript b/ns/ext/dynmanifest/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/dynmanifest/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/event/ext.pc.in b/ns/ext/event/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/event/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/event/waf b/ns/ext/event/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/event/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/event/wscript b/ns/ext/event/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/event/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/files/ext.pc.in b/ns/ext/files/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/files/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/files/waf b/ns/ext/files/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/files/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/files/wscript b/ns/ext/files/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/files/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/host-info/ext.pc.in b/ns/ext/host-info/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/host-info/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/host-info/waf b/ns/ext/host-info/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/host-info/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/host-info/wscript b/ns/ext/host-info/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/host-info/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/instance-access/ext.pc.in b/ns/ext/instance-access/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/instance-access/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/instance-access/waf b/ns/ext/instance-access/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/instance-access/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/instance-access/wscript b/ns/ext/instance-access/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/instance-access/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/midi/ext.pc.in b/ns/ext/midi/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/midi/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/midi/waf b/ns/ext/midi/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/midi/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/midi/wscript b/ns/ext/midi/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/midi/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/osc/ext.pc.in b/ns/ext/osc/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/osc/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/osc/waf b/ns/ext/osc/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/osc/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/osc/wscript b/ns/ext/osc/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/osc/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/parameter/ext.pc.in b/ns/ext/parameter/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/parameter/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/parameter/waf b/ns/ext/parameter/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/parameter/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/parameter/wscript b/ns/ext/parameter/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/parameter/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/port-groups/ext.pc.in b/ns/ext/port-groups/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/port-groups/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/port-groups/waf b/ns/ext/port-groups/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/port-groups/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/port-groups/wscript b/ns/ext/port-groups/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/port-groups/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/port-props/ext.pc.in b/ns/ext/port-props/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/port-props/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/port-props/waf b/ns/ext/port-props/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/port-props/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/port-props/wscript b/ns/ext/port-props/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/port-props/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/presets/ext.pc.in b/ns/ext/presets/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/presets/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/presets/waf b/ns/ext/presets/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/presets/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/presets/wscript b/ns/ext/presets/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/presets/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/pui/ext.pc.in b/ns/ext/pui/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/pui/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/pui/waf b/ns/ext/pui/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/pui/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/pui/wscript b/ns/ext/pui/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/pui/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/reference/ext.pc.in b/ns/ext/reference/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/reference/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/reference/waf b/ns/ext/reference/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/reference/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/reference/wscript b/ns/ext/reference/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/reference/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/resize-port/ext.pc.in b/ns/ext/resize-port/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/resize-port/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/resize-port/waf b/ns/ext/resize-port/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/resize-port/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/resize-port/wscript b/ns/ext/resize-port/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/resize-port/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/state/ext.pc.in b/ns/ext/state/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/state/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/state/waf b/ns/ext/state/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/state/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/state/wscript b/ns/ext/state/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/state/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/string-port/ext.pc.in b/ns/ext/string-port/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/string-port/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/string-port/waf b/ns/ext/string-port/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/string-port/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/string-port/wscript b/ns/ext/string-port/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/string-port/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/time/ext.pc.in b/ns/ext/time/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/time/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/time/waf b/ns/ext/time/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/time/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/time/wscript b/ns/ext/time/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/time/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/ui-resize/ext.pc.in b/ns/ext/ui-resize/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/ui-resize/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/ui-resize/waf b/ns/ext/ui-resize/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/ui-resize/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/ui-resize/wscript b/ns/ext/ui-resize/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/ui-resize/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/uri-map/ext.pc.in b/ns/ext/uri-map/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/uri-map/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/uri-map/waf b/ns/ext/uri-map/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/uri-map/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/uri-map/wscript b/ns/ext/uri-map/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/uri-map/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/uri-unmap/ext.pc.in b/ns/ext/uri-unmap/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/uri-unmap/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/uri-unmap/waf b/ns/ext/uri-unmap/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/uri-unmap/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/uri-unmap/wscript b/ns/ext/uri-unmap/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/uri-unmap/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/ext/urid/ext.pc.in b/ns/ext/urid/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/ext/urid/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/ext/urid/waf b/ns/ext/urid/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/ext/urid/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/ext/urid/wscript b/ns/ext/urid/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/ext/urid/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/extensions/ui/ext.pc.in b/ns/extensions/ui/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/extensions/ui/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/extensions/ui/waf b/ns/extensions/ui/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/extensions/ui/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/extensions/ui/wscript b/ns/extensions/ui/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/extensions/ui/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/ns/extensions/units/ext.pc.in b/ns/extensions/units/ext.pc.in
deleted file mode 120000
index 1cdad2a..0000000
--- a/ns/extensions/units/ext.pc.in
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.pc.in
\ No newline at end of file
diff --git a/ns/extensions/units/waf b/ns/extensions/units/waf
deleted file mode 120000
index 917d5c5..0000000
--- a/ns/extensions/units/waf
+++ /dev/null
@@ -1 +0,0 @@
-../../../waf
\ No newline at end of file
diff --git a/ns/extensions/units/wscript b/ns/extensions/units/wscript
deleted file mode 120000
index cf8cbae..0000000
--- a/ns/extensions/units/wscript
+++ /dev/null
@@ -1 +0,0 @@
-../../../ext.wscript
\ No newline at end of file
diff --git a/wscript b/wscript
index 7cc8f32..5403b8a 100644
--- a/wscript
+++ b/wscript
@@ -29,7 +29,7 @@ def options(opt):
     opt.add_option('--experimental', action='store_true', default=False,
                    dest='experimental',
                    help='Install unreleased experimental extensions')
-    for i in ['ns/lv2core']:
+    for i in ['lv2/ns/lv2core']:
         opt.recurse(i)
 
 def configure(conf):
@@ -39,9 +39,9 @@ def configure(conf):
 
     conf.env.append_unique('CFLAGS', '-std=c99')
 
-    subdirs = ['ns/lv2core']
-    subdirs += glob.glob('ns/ext/*/')
-    subdirs += glob.glob('ns/extensions/*/')
+    subdirs = ['lv2/ns/lv2core']
+    subdirs += glob.glob('lv2/ns/ext/*/')
+    subdirs += glob.glob('lv2/ns/extensions/*/')
 
     for i in subdirs:
         conf.recurse(i)
@@ -86,7 +86,7 @@ def release(ctx):
                 Logs.error('Error building %s release' % name)
         
 def lint(ctx):
-    for i in (['ns/lv2core/lv2.h']
-              + glob.glob('ns/ext/*/*.h')
-              + glob.glob('ns/extensions/*/*.h')):
+    for i in (['lv2/ns/lv2core/lv2.h']
+              + glob.glob('lv2/ns/ext/*/*.h')
+              + glob.glob('lv2/ns/extensions/*/*.h')):
         subprocess.call('cpplint.py --filter=+whitespace/comments,-whitespace/tab,-whitespace/braces,-whitespace/labels,-whitespace/blank_line,-build/header_guard,-readability/casting,-readability/todo,-build/include ' + i, shell=True)