diff --git a/modules/rhizo_base/files/var/SysmoBTS/README.md b/modules/rhizo_base/files/SysmoBTS/README.md
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/README.md
rename to modules/rhizo_base/files/SysmoBTS/README.md
diff --git a/modules/rhizo_base/files/var/SysmoBTS/authorized_keys b/modules/rhizo_base/files/SysmoBTS/authorized_keys
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/authorized_keys
rename to modules/rhizo_base/files/SysmoBTS/authorized_keys
diff --git a/modules/rhizo_base/files/var/SysmoBTS/base-feeds-nightly.conf b/modules/rhizo_base/files/SysmoBTS/base-feeds-nightly.conf
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/base-feeds-nightly.conf
rename to modules/rhizo_base/files/SysmoBTS/base-feeds-nightly.conf
diff --git a/modules/rhizo_base/files/var/SysmoBTS/bts b/modules/rhizo_base/files/SysmoBTS/bts
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/bts
rename to modules/rhizo_base/files/SysmoBTS/bts
diff --git a/modules/rhizo_base/files/var/SysmoBTS/check.sh b/modules/rhizo_base/files/SysmoBTS/check.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/check.sh
rename to modules/rhizo_base/files/SysmoBTS/check.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/chk_masq b/modules/rhizo_base/files/SysmoBTS/chk_masq
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/chk_masq
rename to modules/rhizo_base/files/SysmoBTS/chk_masq
diff --git a/modules/rhizo_base/files/var/SysmoBTS/expect_5.45-r1.0_armv5te.ipk b/modules/rhizo_base/files/SysmoBTS/expect_5.45-r1.0_armv5te.ipk
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/expect_5.45-r1.0_armv5te.ipk
rename to modules/rhizo_base/files/SysmoBTS/expect_5.45-r1.0_armv5te.ipk
diff --git a/modules/rhizo_base/files/var/SysmoBTS/interfaces b/modules/rhizo_base/files/SysmoBTS/interfaces
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/interfaces
rename to modules/rhizo_base/files/SysmoBTS/interfaces
diff --git a/modules/rhizo_base/files/var/SysmoBTS/led.service b/modules/rhizo_base/files/SysmoBTS/led.service
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/led.service
rename to modules/rhizo_base/files/SysmoBTS/led.service
diff --git a/modules/rhizo_base/files/var/SysmoBTS/leds.sh b/modules/rhizo_base/files/SysmoBTS/leds.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/leds.sh
rename to modules/rhizo_base/files/SysmoBTS/leds.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/libtcl8.6-0_8.6.6-r0.0_armv5te.ipk b/modules/rhizo_base/files/SysmoBTS/libtcl8.6-0_8.6.6-r0.0_armv5te.ipk
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/libtcl8.6-0_8.6.6-r0.0_armv5te.ipk
rename to modules/rhizo_base/files/SysmoBTS/libtcl8.6-0_8.6.6-r0.0_armv5te.ipk
diff --git a/modules/rhizo_base/files/var/SysmoBTS/maint.sh b/modules/rhizo_base/files/SysmoBTS/maint.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/maint.sh
rename to modules/rhizo_base/files/SysmoBTS/maint.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/master/gpsd b/modules/rhizo_base/files/SysmoBTS/master/gpsd
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/master/gpsd
rename to modules/rhizo_base/files/SysmoBTS/master/gpsd
diff --git a/modules/rhizo_base/files/var/SysmoBTS/master/ntp.conf b/modules/rhizo_base/files/SysmoBTS/master/ntp.conf
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/master/ntp.conf
rename to modules/rhizo_base/files/SysmoBTS/master/ntp.conf
diff --git a/modules/rhizo_base/files/var/SysmoBTS/mgr b/modules/rhizo_base/files/SysmoBTS/mgr
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/mgr
rename to modules/rhizo_base/files/SysmoBTS/mgr
diff --git a/modules/rhizo_base/files/var/SysmoBTS/opkg-1.sh b/modules/rhizo_base/files/SysmoBTS/opkg-1.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/opkg-1.sh
rename to modules/rhizo_base/files/SysmoBTS/opkg-1.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/opkg-split.sh b/modules/rhizo_base/files/SysmoBTS/opkg-split.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/opkg-split.sh
rename to modules/rhizo_base/files/SysmoBTS/opkg-split.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/opkg.sh b/modules/rhizo_base/files/SysmoBTS/opkg.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/opkg.sh
rename to modules/rhizo_base/files/SysmoBTS/opkg.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz b/modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz
rename to modules/rhizo_base/files/SysmoBTS/osmo-bts-sysmo-arm-cf7a.gz
diff --git a/modules/rhizo_base/files/var/SysmoBTS/osmo-bts.service b/modules/rhizo_base/files/SysmoBTS/osmo-bts.service
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/osmo-bts.service
rename to modules/rhizo_base/files/SysmoBTS/osmo-bts.service
diff --git a/modules/rhizo_base/files/var/SysmoBTS/osmo-pcu-arm-54211.gz b/modules/rhizo_base/files/SysmoBTS/osmo-pcu-arm-54211.gz
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/osmo-pcu-arm-54211.gz
rename to modules/rhizo_base/files/SysmoBTS/osmo-pcu-arm-54211.gz
diff --git a/modules/rhizo_base/files/var/SysmoBTS/pcu b/modules/rhizo_base/files/SysmoBTS/pcu
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/pcu
rename to modules/rhizo_base/files/SysmoBTS/pcu
diff --git a/modules/rhizo_base/files/var/SysmoBTS/pcu-ns b/modules/rhizo_base/files/SysmoBTS/pcu-ns
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/pcu-ns
rename to modules/rhizo_base/files/SysmoBTS/pcu-ns
diff --git a/modules/rhizo_base/files/var/SysmoBTS/provision.sh b/modules/rhizo_base/files/SysmoBTS/provision.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/provision.sh
rename to modules/rhizo_base/files/SysmoBTS/provision.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/pwr b/modules/rhizo_base/files/SysmoBTS/pwr
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/pwr
rename to modules/rhizo_base/files/SysmoBTS/pwr
diff --git a/modules/rhizo_base/files/var/SysmoBTS/rc.local b/modules/rhizo_base/files/SysmoBTS/rc.local
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/rc.local
rename to modules/rhizo_base/files/SysmoBTS/rc.local
diff --git a/modules/rhizo_base/files/var/SysmoBTS/route.sh b/modules/rhizo_base/files/SysmoBTS/route.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/route.sh
rename to modules/rhizo_base/files/SysmoBTS/route.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/scp-all.sh b/modules/rhizo_base/files/SysmoBTS/scp-all.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/scp-all.sh
rename to modules/rhizo_base/files/SysmoBTS/scp-all.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/slave/gpsdate b/modules/rhizo_base/files/SysmoBTS/slave/gpsdate
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/slave/gpsdate
rename to modules/rhizo_base/files/SysmoBTS/slave/gpsdate
diff --git a/modules/rhizo_base/files/var/SysmoBTS/ssh-all.sh b/modules/rhizo_base/files/SysmoBTS/ssh-all.sh
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/ssh-all.sh
rename to modules/rhizo_base/files/SysmoBTS/ssh-all.sh
diff --git a/modules/rhizo_base/files/var/SysmoBTS/sysmobts-mgr-arm.gz b/modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/sysmobts-mgr-arm.gz
rename to modules/rhizo_base/files/SysmoBTS/sysmobts-mgr-arm.gz
diff --git a/modules/rhizo_base/files/var/SysmoBTS/tcl_8.6.6-r0.0_armv5te.ipk b/modules/rhizo_base/files/SysmoBTS/tcl_8.6.6-r0.0_armv5te.ipk
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/tcl_8.6.6-r0.0_armv5te.ipk
rename to modules/rhizo_base/files/SysmoBTS/tcl_8.6.6-r0.0_armv5te.ipk
diff --git a/modules/rhizo_base/files/var/SysmoBTS/tgl-m b/modules/rhizo_base/files/SysmoBTS/tgl-m
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/tgl-m
rename to modules/rhizo_base/files/SysmoBTS/tgl-m
diff --git a/modules/rhizo_base/files/var/SysmoBTS/tgl-s b/modules/rhizo_base/files/SysmoBTS/tgl-s
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/tgl-s
rename to modules/rhizo_base/files/SysmoBTS/tgl-s
diff --git a/modules/rhizo_base/files/var/SysmoBTS/udhcpc b/modules/rhizo_base/files/SysmoBTS/udhcpc
similarity index 100%
rename from modules/rhizo_base/files/var/SysmoBTS/udhcpc
rename to modules/rhizo_base/files/SysmoBTS/udhcpc
diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index dfccfb0..cb28c79 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -544,7 +544,7 @@ schedule { 'never':
 
   file { '/var/SysmoBTS':
       ensure  => directory,
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS',
       owner   => 'root',
       group   => 'root',
       recurse => remote
@@ -565,47 +565,47 @@ schedule { 'never':
     }
 
   file { '/var/SysmoBTS/check.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/check.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/check.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/provision.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/provision.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/provision.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/maint.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/maint.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/maint.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/opkg.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/opkg.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/opkg.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/opkg-1.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/opkg-1.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/opkg-1.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/opkg-split.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/opkg-split.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/opkg-split.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/chk_masq':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/chk_masq',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/chk_masq',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/scp-all.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/scp-all.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/scp-all.sh',
       mode    => '0750'
     }
 
   file { '/var/SysmoBTS/ssh-all.sh':
-      source  => 'puppet:///modules/rhizo_base/var/SysmoBTS/ssh-all.sh',
+      source  => 'puppet:///modules/rhizo_base/SysmoBTS/ssh-all.sh',
       mode    => '0750'
     }