diff -ru ardour-9999/gtk2_ardour/wscript ardour-9999_new/gtk2_ardour/wscript
--- ardour-9999/gtk2_ardour/wscript	2014-04-26 11:22:16.792003587 +0200
+++ ardour-9999_new/gtk2_ardour/wscript	2014-04-26 11:49:28.780114385 +0200
@@ -424,7 +424,7 @@
         'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"',
         'LOCALEDIR="' + os.path.join(os.path.normpath(bld.env['DATADIR']), 'locale') + '"',
         ]
-    obj.install_path = os.path.join(bld.env['DLLDIR'])
+    obj.install_path = bld.env['DLLDIR']
     obj.uselib       = 'UUID FLAC FONTCONFIG GLIBMM GTHREAD GTK OGG CURL DL'
     obj.uselib       += ' GTKMM CANVAS FFTW3F'
     obj.uselib       += ' AUDIOUNITS OSX GTKOSX LO '

diff -ru ardour-9999/gtk2_ardour/ardour.sh.in ardour-9999_new/gtk2_ardour/ardour.sh.in
--- ardour-9999/gtk2_ardour/ardour.sh.in	2014-04-26 12:18:10.156231252 +0200
+++ ardour-9999_new/gtk2_ardour/ardour.sh.in	2014-04-26 12:25:14.693260074 +0200
@@ -5,9 +5,9 @@
 # and does a few checks before exec'ing the real executable.
 # 
 
-export GTK_PATH=@SYSCONFDIR@/ardour3:@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH}
+export GTK_PATH=@SYSCONFDIR@:@LIBDIR@${GTK_PATH:+:$GTK_PATH}
 
-export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
 ## Memlock check
 
@@ -23,7 +23,7 @@
 
 ## Glib atomic test
 
-GLIB=$(ldd @LIBDIR@/ardour3/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
+GLIB=$(ldd @LIBDIR@/ardour-@VERSION@ 2> /dev/null | grep glib-2.0 | sed 's/.*=> \([^ ]*\) .*/\1/')
 
 if [ "$GLIB" = "" ]; then
 	echo "WARNING: Could not check your glib-2.0 for mutex locking atomic operations."
@@ -43,15 +43,15 @@
 # Running Ardour requires these 3 variables to be set
 #
 
-export ARDOUR_DATA_PATH=@DATADIR@/ardour3
-export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3
-export ARDOUR_DLL_PATH=@LIBDIR@/ardour3
+export ARDOUR_DATA_PATH=@DATADIR@
+export ARDOUR_CONFIG_PATH=@SYSCONFDIR@
+export ARDOUR_DLL_PATH=@LIBDIR@
 
 #
 # VAMP has its own lookup path
 # 
 
-export VAMP_PATH=@LIBDIR@/ardour3/vamp
+export VAMP_PATH=@LIBDIR@/vamp
 
 if [ $# -gt 0 ] ; then
     case $1 in
@@ -59,6 +59,6 @@
     esac
 fi
 
-exec $GDB @LIBDIR@/ardour3/ardour-@VERSION@ "$@"
+exec $GDB @LIBDIR@/ardour-@VERSION@ "$@"
 
 
diff -ru ardour-9999/vst/ardourvst.in ardour-9999_new/vst/ardourvst.in
--- ardour-9999/vst/ardourvst.in	2014-04-26 12:18:10.776231294 +0200
+++ ardour-9999_new/vst/ardourvst.in	2014-04-26 12:25:50.532262507 +0200
@@ -4,13 +4,13 @@
 # Running Ardour requires these 3 variables to be set
 #
 
-export ARDOUR_DATA_PATH=@DATADIR@/ardour3
-export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3
-export ARDOUR_DLL_PATH=@LIBDIR@/ardour3
+export ARDOUR_DATA_PATH=@DATADIR@
+export ARDOUR_CONFIG_PATH=@SYSCONFDIR@
+export ARDOUR_DLL_PATH=@LIBDIR@
 
-export GTK_PATH=@LIBDIR@/ardour3${GTK_PATH:+:$GTK_PATH}
-export LD_LIBRARY_PATH=@LIBDIR@/ardour3${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+export GTK_PATH=@LIBDIR@${GTK_PATH:+:$GTK_PATH}
+export LD_LIBRARY_PATH=@LIBDIR@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
 
-exec wine @LIBDIR@/ardour3/ardour-@VERSION@-vst.exe.so "$@"
+exec wine @LIBDIR@/ardour-@VERSION@-vst.exe.so "$@"
 
 
diff -ru ardour-9999/export/wscript ardour-9999_new/export/wscript
--- ardour-9999/export/wscript	2014-04-26 12:58:05.790393894 +0200
+++ ardour-9999_new/export/wscript	2014-04-26 12:59:07.814398105 +0200
@@ -11,7 +11,7 @@
 def build(bld):
     presets = bld.path.ant_glob ('*.preset')
     formats = bld.path.ant_glob ('*.format')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'export'),
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'export'),
                       presets + formats)
 
 def options(opt):
diff -ru ardour-9999/mcp/wscript ardour-9999_new/mcp/wscript
--- ardour-9999/mcp/wscript	2014-04-26 12:58:06.340393932 +0200
+++ ardour-9999_new/mcp/wscript	2014-04-26 12:59:34.982399950 +0200
@@ -11,8 +11,8 @@
 def build(bld):
     devinfo = bld.path.ant_glob ('*.device')
     profiles = bld.path.ant_glob ('*.profile')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), devinfo)
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'mcp'), profiles)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), devinfo)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'mcp'), profiles)
 
 def options(opt):
     pass
diff -ru ardour-9999/midi_maps/wscript ardour-9999_new/midi_maps/wscript
--- ardour-9999/midi_maps/wscript	2014-04-26 12:58:06.341393932 +0200
+++ ardour-9999_new/midi_maps/wscript	2014-04-26 12:59:39.230400238 +0200
@@ -10,7 +10,7 @@
 
 def build(bld):
     maps = bld.path.ant_glob ('*.map')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'midi_maps'),
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'midi_maps'),
                        maps)
 
 def options(opt):
diff -ru ardour-9999/patchfiles/wscript ardour-9999_new/patchfiles/wscript
--- ardour-9999/patchfiles/wscript	2014-04-26 12:58:06.374393934 +0200
+++ ardour-9999_new/patchfiles/wscript	2014-04-26 13:00:00.798401703 +0200
@@ -10,7 +10,7 @@
 
 def build(bld):
     patchfiles = bld.path.ant_glob ('*.midnam')
-    bld.install_files (os.path.join(bld.env['DATADIR'], 'ardour3', 'patchfiles'), patchfiles)
+    bld.install_files (os.path.join(bld.env['DATADIR'], 'patchfiles'), patchfiles)
 
 def options(opt):
     pass
diff -ru ardour-9999/templates/wscript ardour-9999_new/templates/wscript
--- ardour-9999/templates/wscript	2014-04-26 12:58:06.374393934 +0200
+++ ardour-9999_new/templates/wscript	2014-04-26 12:59:21.422399029 +0200
@@ -35,7 +35,7 @@
                   name = 'template',
                   source = [ t ],
                   target = [ os.path.join(dir_name, file_name) ],
-                  install_path = os.path.join(bld.env['DATADIR'], 'ardour3', os.path.join('templates', dir_name)))
+                  install_path = os.path.join(bld.env['DATADIR'], os.path.join('templates', dir_name)))
 
 def options(opt):
     pass