From 62c440471d958fb91d41fddbc5fb07841c81f556 Mon Sep 17 00:00:00 2001
From: DreymaR <obgadmar@gmail.com>
Date: Mon, 20 Aug 2018 16:26:11 +0200
Subject: [PATCH] Removed version names on data dirs

---
 install-dreymar-xmod.sh                                  | 9 ++++-----
 xkb-data_bak/xkb-data_version.txt                        | 5 +++++
 .../xkb/geometry/pc                                      | 0
 .../xkb/keycodes/aliases                                 | 0
 .../xkb/keycodes/evdev                                   | 0
 .../xkb/keycodes/xfree86                                 | 0
 .../xkb/rules/evdev                                      | 0
 .../xkb/rules/evdev.lst                                  | 0
 .../xkb/rules/evdev.xml                                  | 0
 .../xkb/symbols/al                                       | 0
 .../xkb/symbols/at                                       | 0
 .../xkb/symbols/ba                                       | 0
 .../xkb/symbols/be                                       | 0
 .../xkb/symbols/bg                                       | 0
 .../xkb/symbols/br                                       | 0
 .../xkb/symbols/ca                                       | 0
 .../xkb/symbols/cz                                       | 0
 .../xkb/symbols/de                                       | 0
 .../xkb/symbols/dk                                       | 0
 .../xkb/symbols/epo                                      | 0
 .../xkb/symbols/es                                       | 0
 .../xkb/symbols/fi                                       | 0
 .../xkb/symbols/fr                                       | 0
 .../xkb/symbols/gb                                       | 0
 .../xkb/symbols/gr                                       | 0
 .../xkb/symbols/group                                    | 0
 .../xkb/symbols/hr                                       | 0
 .../xkb/symbols/hu                                       | 0
 .../xkb/symbols/il                                       | 0
 .../xkb/symbols/is                                       | 0
 .../xkb/symbols/it                                       | 0
 .../xkb/symbols/latam                                    | 0
 .../xkb/symbols/level5                                   | 0
 .../xkb/symbols/nl                                       | 0
 .../xkb/symbols/no                                       | 0
 .../xkb/symbols/pl                                       | 0
 .../xkb/symbols/pt                                       | 0
 .../xkb/symbols/ro                                       | 0
 .../xkb/symbols/rs                                       | 0
 .../xkb/symbols/ru                                       | 0
 .../xkb/symbols/se                                       | 0
 .../xkb/symbols/si                                       | 0
 .../xkb/symbols/sk                                       | 0
 .../xkb/symbols/tr                                       | 0
 .../xkb/symbols/us                                       | 0
 .../xkb/types/level5                                     | 0
 xkb-data_mod/xkb-data_version.txt                        | 5 +++++
 .../xkb/geometry/pc                                      | 0
 .../xkb/keycodes/aliases                                 | 0
 .../xkb/keycodes/evdev                                   | 0
 .../xkb/keycodes/xfree86                                 | 0
 .../xkb/rules/evdev                                      | 0
 .../xkb/rules/evdev.lst                                  | 0
 .../xkb/rules/evdev.xml                                  | 0
 .../xkb/symbols/al                                       | 0
 .../xkb/symbols/at                                       | 0
 .../xkb/symbols/ba                                       | 0
 .../xkb/symbols/be                                       | 0
 .../xkb/symbols/bg                                       | 0
 .../xkb/symbols/br                                       | 0
 .../xkb/symbols/ca                                       | 0
 .../xkb/symbols/colemak                                  | 0
 .../xkb/symbols/colemak_eD_epo                           | 0
 .../xkb/symbols/colemak_eD_template                      | 0
 .../xkb/symbols/cz                                       | 0
 .../xkb/symbols/de                                       | 0
 .../xkb/symbols/dk                                       | 0
 .../xkb/symbols/epo                                      | 0
 .../xkb/symbols/es                                       | 0
 .../xkb/symbols/extend                                   | 0
 .../xkb/symbols/fi                                       | 0
 .../xkb/symbols/fr                                       | 0
 .../xkb/symbols/gb                                       | 0
 .../xkb/symbols/gr                                       | 0
 .../xkb/symbols/group                                    | 0
 .../xkb/symbols/hr                                       | 0
 .../xkb/symbols/hu                                       | 0
 .../xkb/symbols/il                                       | 0
 .../xkb/symbols/is                                       | 0
 .../xkb/symbols/it                                       | 0
 .../xkb/symbols/latam                                    | 0
 .../xkb/symbols/level5                                   | 0
 .../xkb/symbols/nl                                       | 0
 .../xkb/symbols/no                                       | 0
 .../xkb/symbols/pl                                       | 0
 .../xkb/symbols/pt                                       | 0
 .../xkb/symbols/ro                                       | 0
 .../xkb/symbols/rs                                       | 0
 .../xkb/symbols/ru                                       | 0
 .../xkb/symbols/se                                       | 0
 .../xkb/symbols/si                                       | 0
 .../xkb/symbols/sk                                       | 0
 .../xkb/symbols/tr                                       | 0
 .../xkb/symbols/us                                       | 0
 .../xkb/types/level5                                     | 0
 95 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 xkb-data_bak/xkb-data_version.txt
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/geometry/pc (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/keycodes/aliases (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/keycodes/evdev (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/keycodes/xfree86 (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/rules/evdev (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/rules/evdev.lst (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/rules/evdev.xml (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/al (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/at (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/ba (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/be (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/bg (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/br (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/ca (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/cz (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/de (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/dk (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/epo (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/es (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/fi (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/fr (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/gb (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/gr (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/group (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/hr (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/hu (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/il (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/is (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/it (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/latam (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/level5 (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/nl (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/no (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/pl (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/pt (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/ro (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/rs (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/ru (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/se (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/si (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/sk (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/tr (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/symbols/us (100%)
 rename {x-bak_v2-17-1ub1_2016-05-24 => xkb-data_bak}/xkb/types/level5 (100%)
 create mode 100644 xkb-data_mod/xkb-data_version.txt
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/geometry/pc (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/keycodes/aliases (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/keycodes/evdev (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/keycodes/xfree86 (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/rules/evdev (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/rules/evdev.lst (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/rules/evdev.xml (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/al (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/at (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/ba (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/be (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/bg (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/br (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/ca (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/colemak (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/colemak_eD_epo (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/colemak_eD_template (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/cz (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/de (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/dk (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/epo (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/es (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/extend (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/fi (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/fr (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/gb (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/gr (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/group (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/hr (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/hu (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/il (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/is (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/it (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/latam (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/level5 (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/nl (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/no (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/pl (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/pt (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/ro (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/rs (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/ru (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/se (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/si (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/sk (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/tr (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/symbols/us (100%)
 rename {x-mod_v2-17-1ub1_2016-06-06 => xkb-data_mod}/xkb/types/level5 (100%)

diff --git a/install-dreymar-xmod.sh b/install-dreymar-xmod.sh
index 5753552..fd5a139 100644
--- a/install-dreymar-xmod.sh
+++ b/install-dreymar-xmod.sh
@@ -45,18 +45,17 @@ FootStr="Happy xkb-hacking! ~ Øystein Bech 'DreymaR' Gadmar"
 MyDATE=`date +"%Y-%m-%d_%H-%M"`
 MyNAME=`basename $0`
 MyPATH=`dirname $0`
-#~ XVERSION='2-5-1-3ub2'
-#~ XVERSION='2-10-1-1'
-#~ XVERSION='2-12-1'
-XVERSION='2-17-1ub1'
 ## @@@ The default X11 dir under Debian/Ubuntu/etc is /usr/share/X11  @@@
 ## @@@ The default X11 dir under some (older) distros is /usr/lib/X11 @@@
 X11DIR='/usr/share/X11'; [ -d "${X11DIR}" ] || X11DIR='/usr/lib/X11'
+#~ XVERSION='2-17-1ub1'
+XVERSION=''
 ModDATE=''
 
 DModDir=`dirname $0`	# (-d) Path to the script (and mod?) root directory
 ToolDir="${DModDir}/dreymar-xtools"	# The location of tool scripts (like setxkb.sh)
-DModTag="x-mod_v${XVERSION}${ModDATE:+'_'}${ModDATE}"	# (-t) Mod dir "prefix"
+DMod='xkb-data_mod'		# (--) The main name of the directory with modded xkb-data files
+DModTag="${DMod}${XVERSION:+'_v'}${XVERSION}${ModDATE:+'_'}${ModDATE}"	# (-t) Mod dir "prefix"
 DBakFix='dbak-'			# (--) Backup dir prefix
 DModFix='d'				# (--) Modded dir prefix
 InstDir="${X11DIR}"		# (-i) Path to install subfolder(s) in
diff --git a/xkb-data_bak/xkb-data_version.txt b/xkb-data_bak/xkb-data_version.txt
new file mode 100644
index 0000000..5bbda10
--- /dev/null
+++ b/xkb-data_bak/xkb-data_version.txt
@@ -0,0 +1,5 @@
+XKB data for DreymaR's Big Bag of Keyboard Tricks
+=================================================
+
+xkb-data version: 2-17-1ub1
+My starting date: 2016-05-24
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/geometry/pc b/xkb-data_bak/xkb/geometry/pc
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/geometry/pc
rename to xkb-data_bak/xkb/geometry/pc
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/aliases b/xkb-data_bak/xkb/keycodes/aliases
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/aliases
rename to xkb-data_bak/xkb/keycodes/aliases
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/evdev b/xkb-data_bak/xkb/keycodes/evdev
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/evdev
rename to xkb-data_bak/xkb/keycodes/evdev
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/xfree86 b/xkb-data_bak/xkb/keycodes/xfree86
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/keycodes/xfree86
rename to xkb-data_bak/xkb/keycodes/xfree86
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev b/xkb-data_bak/xkb/rules/evdev
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev
rename to xkb-data_bak/xkb/rules/evdev
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev.lst b/xkb-data_bak/xkb/rules/evdev.lst
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev.lst
rename to xkb-data_bak/xkb/rules/evdev.lst
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev.xml b/xkb-data_bak/xkb/rules/evdev.xml
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/rules/evdev.xml
rename to xkb-data_bak/xkb/rules/evdev.xml
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/al b/xkb-data_bak/xkb/symbols/al
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/al
rename to xkb-data_bak/xkb/symbols/al
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/at b/xkb-data_bak/xkb/symbols/at
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/at
rename to xkb-data_bak/xkb/symbols/at
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ba b/xkb-data_bak/xkb/symbols/ba
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ba
rename to xkb-data_bak/xkb/symbols/ba
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/be b/xkb-data_bak/xkb/symbols/be
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/be
rename to xkb-data_bak/xkb/symbols/be
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/bg b/xkb-data_bak/xkb/symbols/bg
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/bg
rename to xkb-data_bak/xkb/symbols/bg
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/br b/xkb-data_bak/xkb/symbols/br
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/br
rename to xkb-data_bak/xkb/symbols/br
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ca b/xkb-data_bak/xkb/symbols/ca
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ca
rename to xkb-data_bak/xkb/symbols/ca
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/cz b/xkb-data_bak/xkb/symbols/cz
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/cz
rename to xkb-data_bak/xkb/symbols/cz
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/de b/xkb-data_bak/xkb/symbols/de
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/de
rename to xkb-data_bak/xkb/symbols/de
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/dk b/xkb-data_bak/xkb/symbols/dk
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/dk
rename to xkb-data_bak/xkb/symbols/dk
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/epo b/xkb-data_bak/xkb/symbols/epo
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/epo
rename to xkb-data_bak/xkb/symbols/epo
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/es b/xkb-data_bak/xkb/symbols/es
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/es
rename to xkb-data_bak/xkb/symbols/es
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fi b/xkb-data_bak/xkb/symbols/fi
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fi
rename to xkb-data_bak/xkb/symbols/fi
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fr b/xkb-data_bak/xkb/symbols/fr
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/fr
rename to xkb-data_bak/xkb/symbols/fr
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gb b/xkb-data_bak/xkb/symbols/gb
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gb
rename to xkb-data_bak/xkb/symbols/gb
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gr b/xkb-data_bak/xkb/symbols/gr
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/gr
rename to xkb-data_bak/xkb/symbols/gr
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/group b/xkb-data_bak/xkb/symbols/group
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/group
rename to xkb-data_bak/xkb/symbols/group
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hr b/xkb-data_bak/xkb/symbols/hr
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hr
rename to xkb-data_bak/xkb/symbols/hr
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hu b/xkb-data_bak/xkb/symbols/hu
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/hu
rename to xkb-data_bak/xkb/symbols/hu
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/il b/xkb-data_bak/xkb/symbols/il
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/il
rename to xkb-data_bak/xkb/symbols/il
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/is b/xkb-data_bak/xkb/symbols/is
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/is
rename to xkb-data_bak/xkb/symbols/is
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/it b/xkb-data_bak/xkb/symbols/it
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/it
rename to xkb-data_bak/xkb/symbols/it
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/latam b/xkb-data_bak/xkb/symbols/latam
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/latam
rename to xkb-data_bak/xkb/symbols/latam
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/level5 b/xkb-data_bak/xkb/symbols/level5
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/level5
rename to xkb-data_bak/xkb/symbols/level5
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/nl b/xkb-data_bak/xkb/symbols/nl
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/nl
rename to xkb-data_bak/xkb/symbols/nl
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/no b/xkb-data_bak/xkb/symbols/no
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/no
rename to xkb-data_bak/xkb/symbols/no
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pl b/xkb-data_bak/xkb/symbols/pl
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pl
rename to xkb-data_bak/xkb/symbols/pl
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pt b/xkb-data_bak/xkb/symbols/pt
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/pt
rename to xkb-data_bak/xkb/symbols/pt
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ro b/xkb-data_bak/xkb/symbols/ro
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ro
rename to xkb-data_bak/xkb/symbols/ro
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/rs b/xkb-data_bak/xkb/symbols/rs
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/rs
rename to xkb-data_bak/xkb/symbols/rs
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ru b/xkb-data_bak/xkb/symbols/ru
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/ru
rename to xkb-data_bak/xkb/symbols/ru
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/se b/xkb-data_bak/xkb/symbols/se
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/se
rename to xkb-data_bak/xkb/symbols/se
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/si b/xkb-data_bak/xkb/symbols/si
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/si
rename to xkb-data_bak/xkb/symbols/si
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/sk b/xkb-data_bak/xkb/symbols/sk
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/sk
rename to xkb-data_bak/xkb/symbols/sk
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/tr b/xkb-data_bak/xkb/symbols/tr
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/tr
rename to xkb-data_bak/xkb/symbols/tr
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/us b/xkb-data_bak/xkb/symbols/us
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/symbols/us
rename to xkb-data_bak/xkb/symbols/us
diff --git a/x-bak_v2-17-1ub1_2016-05-24/xkb/types/level5 b/xkb-data_bak/xkb/types/level5
similarity index 100%
rename from x-bak_v2-17-1ub1_2016-05-24/xkb/types/level5
rename to xkb-data_bak/xkb/types/level5
diff --git a/xkb-data_mod/xkb-data_version.txt b/xkb-data_mod/xkb-data_version.txt
new file mode 100644
index 0000000..b7c0aea
--- /dev/null
+++ b/xkb-data_mod/xkb-data_version.txt
@@ -0,0 +1,5 @@
+XKB data for DreymaR's Big Bag of Keyboard Tricks
+=================================================
+
+xkb-data version: 2-17-1ub1, edition DreymaR
+My starting date: 2016-06-06
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc b/xkb-data_mod/xkb/geometry/pc
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/geometry/pc
rename to xkb-data_mod/xkb/geometry/pc
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases b/xkb-data_mod/xkb/keycodes/aliases
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/aliases
rename to xkb-data_mod/xkb/keycodes/aliases
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev b/xkb-data_mod/xkb/keycodes/evdev
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/evdev
rename to xkb-data_mod/xkb/keycodes/evdev
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86 b/xkb-data_mod/xkb/keycodes/xfree86
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/keycodes/xfree86
rename to xkb-data_mod/xkb/keycodes/xfree86
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev b/xkb-data_mod/xkb/rules/evdev
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev
rename to xkb-data_mod/xkb/rules/evdev
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst b/xkb-data_mod/xkb/rules/evdev.lst
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.lst
rename to xkb-data_mod/xkb/rules/evdev.lst
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml b/xkb-data_mod/xkb/rules/evdev.xml
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/rules/evdev.xml
rename to xkb-data_mod/xkb/rules/evdev.xml
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al b/xkb-data_mod/xkb/symbols/al
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/al
rename to xkb-data_mod/xkb/symbols/al
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/at b/xkb-data_mod/xkb/symbols/at
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/at
rename to xkb-data_mod/xkb/symbols/at
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ba b/xkb-data_mod/xkb/symbols/ba
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ba
rename to xkb-data_mod/xkb/symbols/ba
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be b/xkb-data_mod/xkb/symbols/be
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/be
rename to xkb-data_mod/xkb/symbols/be
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/bg b/xkb-data_mod/xkb/symbols/bg
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/bg
rename to xkb-data_mod/xkb/symbols/bg
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br b/xkb-data_mod/xkb/symbols/br
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/br
rename to xkb-data_mod/xkb/symbols/br
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca b/xkb-data_mod/xkb/symbols/ca
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ca
rename to xkb-data_mod/xkb/symbols/ca
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak b/xkb-data_mod/xkb/symbols/colemak
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak
rename to xkb-data_mod/xkb/symbols/colemak
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo b/xkb-data_mod/xkb/symbols/colemak_eD_epo
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_epo
rename to xkb-data_mod/xkb/symbols/colemak_eD_epo
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template b/xkb-data_mod/xkb/symbols/colemak_eD_template
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/colemak_eD_template
rename to xkb-data_mod/xkb/symbols/colemak_eD_template
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/cz b/xkb-data_mod/xkb/symbols/cz
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/cz
rename to xkb-data_mod/xkb/symbols/cz
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de b/xkb-data_mod/xkb/symbols/de
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/de
rename to xkb-data_mod/xkb/symbols/de
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk b/xkb-data_mod/xkb/symbols/dk
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/dk
rename to xkb-data_mod/xkb/symbols/dk
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/epo b/xkb-data_mod/xkb/symbols/epo
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/epo
rename to xkb-data_mod/xkb/symbols/epo
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es b/xkb-data_mod/xkb/symbols/es
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/es
rename to xkb-data_mod/xkb/symbols/es
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/extend b/xkb-data_mod/xkb/symbols/extend
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/extend
rename to xkb-data_mod/xkb/symbols/extend
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi b/xkb-data_mod/xkb/symbols/fi
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fi
rename to xkb-data_mod/xkb/symbols/fi
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr b/xkb-data_mod/xkb/symbols/fr
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/fr
rename to xkb-data_mod/xkb/symbols/fr
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gb b/xkb-data_mod/xkb/symbols/gb
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gb
rename to xkb-data_mod/xkb/symbols/gb
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gr b/xkb-data_mod/xkb/symbols/gr
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/gr
rename to xkb-data_mod/xkb/symbols/gr
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/group b/xkb-data_mod/xkb/symbols/group
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/group
rename to xkb-data_mod/xkb/symbols/group
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hr b/xkb-data_mod/xkb/symbols/hr
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hr
rename to xkb-data_mod/xkb/symbols/hr
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hu b/xkb-data_mod/xkb/symbols/hu
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/hu
rename to xkb-data_mod/xkb/symbols/hu
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il b/xkb-data_mod/xkb/symbols/il
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/il
rename to xkb-data_mod/xkb/symbols/il
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is b/xkb-data_mod/xkb/symbols/is
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/is
rename to xkb-data_mod/xkb/symbols/is
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it b/xkb-data_mod/xkb/symbols/it
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/it
rename to xkb-data_mod/xkb/symbols/it
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam b/xkb-data_mod/xkb/symbols/latam
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/latam
rename to xkb-data_mod/xkb/symbols/latam
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/level5 b/xkb-data_mod/xkb/symbols/level5
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/level5
rename to xkb-data_mod/xkb/symbols/level5
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl b/xkb-data_mod/xkb/symbols/nl
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/nl
rename to xkb-data_mod/xkb/symbols/nl
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no b/xkb-data_mod/xkb/symbols/no
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/no
rename to xkb-data_mod/xkb/symbols/no
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl b/xkb-data_mod/xkb/symbols/pl
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pl
rename to xkb-data_mod/xkb/symbols/pl
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt b/xkb-data_mod/xkb/symbols/pt
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/pt
rename to xkb-data_mod/xkb/symbols/pt
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ro b/xkb-data_mod/xkb/symbols/ro
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ro
rename to xkb-data_mod/xkb/symbols/ro
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs b/xkb-data_mod/xkb/symbols/rs
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/rs
rename to xkb-data_mod/xkb/symbols/rs
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru b/xkb-data_mod/xkb/symbols/ru
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/ru
rename to xkb-data_mod/xkb/symbols/ru
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se b/xkb-data_mod/xkb/symbols/se
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/se
rename to xkb-data_mod/xkb/symbols/se
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/si b/xkb-data_mod/xkb/symbols/si
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/si
rename to xkb-data_mod/xkb/symbols/si
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/sk b/xkb-data_mod/xkb/symbols/sk
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/sk
rename to xkb-data_mod/xkb/symbols/sk
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/tr b/xkb-data_mod/xkb/symbols/tr
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/tr
rename to xkb-data_mod/xkb/symbols/tr
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us b/xkb-data_mod/xkb/symbols/us
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/symbols/us
rename to xkb-data_mod/xkb/symbols/us
diff --git a/x-mod_v2-17-1ub1_2016-06-06/xkb/types/level5 b/xkb-data_mod/xkb/types/level5
similarity index 100%
rename from x-mod_v2-17-1ub1_2016-06-06/xkb/types/level5
rename to xkb-data_mod/xkb/types/level5