diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index c26387f249..7d2cf00d85 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -428,7 +428,7 @@ AddFilesToHaikuImage system data Canna dic canna : $(cannaDicCanna) ;
 AddDirectoryToHaikuImage system data Canna dic group ;
 AddDirectoryToHaikuImage system data Canna dic user ;
 
-local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data etc keymaps ]
+local keymapFiles = [ Glob [ FDirName $(HAIKU_TOP) src data keymaps ]
 	: *.keymap ] ;
 keymapFiles = $(keymapFiles:BG=keymap) ;
 AddFilesToHaikuImage system data Keymaps : $(keymapFiles) ;
diff --git a/configure b/configure
index 7be6abc62b..6097b9b545 100755
--- a/configure
+++ b/configure
@@ -534,7 +534,7 @@ HAIKU_TIME_ZONE_SOURCES = ${timezoneSources} ;
 EOF
 
 for source in ${timezoneSources}; do
-	f=$sourceDir/src/data/etc/timezones/$source
+	f=$sourceDir/src/data/timezones/$source
 
 TZOBJECTS=`gawk '/^Zone/ { print $2 } /^Link/ { print $3 } ' "$f" `
 
diff --git a/src/data/etc/keymaps/Albanian.keymap b/src/data/keymaps/Albanian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Albanian.keymap
rename to src/data/keymaps/Albanian.keymap
diff --git a/src/data/etc/keymaps/American.keymap b/src/data/keymaps/American.keymap
similarity index 100%
rename from src/data/etc/keymaps/American.keymap
rename to src/data/keymaps/American.keymap
diff --git a/src/data/etc/keymaps/Arabic (102).keymap b/src/data/keymaps/Arabic (102).keymap
similarity index 100%
rename from src/data/etc/keymaps/Arabic (102).keymap
rename to src/data/keymaps/Arabic (102).keymap
diff --git a/src/data/etc/keymaps/Belgian (comma).keymap b/src/data/keymaps/Belgian (comma).keymap
similarity index 100%
rename from src/data/etc/keymaps/Belgian (comma).keymap
rename to src/data/keymaps/Belgian (comma).keymap
diff --git a/src/data/etc/keymaps/Belgian (point).keymap b/src/data/keymaps/Belgian (point).keymap
similarity index 100%
rename from src/data/etc/keymaps/Belgian (point).keymap
rename to src/data/keymaps/Belgian (point).keymap
diff --git a/src/data/etc/keymaps/Brazilian (ABNT2).keymap b/src/data/keymaps/Brazilian (ABNT2).keymap
similarity index 100%
rename from src/data/etc/keymaps/Brazilian (ABNT2).keymap
rename to src/data/keymaps/Brazilian (ABNT2).keymap
diff --git a/src/data/etc/keymaps/Bulgarian (Cyrillic).keymap b/src/data/keymaps/Bulgarian (Cyrillic).keymap
similarity index 100%
rename from src/data/etc/keymaps/Bulgarian (Cyrillic).keymap
rename to src/data/keymaps/Bulgarian (Cyrillic).keymap
diff --git a/src/data/etc/keymaps/Byelorussian.keymap b/src/data/keymaps/Byelorussian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Byelorussian.keymap
rename to src/data/keymaps/Byelorussian.keymap
diff --git a/src/data/etc/keymaps/Canadian-French.keymap b/src/data/keymaps/Canadian-French.keymap
similarity index 100%
rename from src/data/etc/keymaps/Canadian-French.keymap
rename to src/data/keymaps/Canadian-French.keymap
diff --git a/src/data/etc/keymaps/Colemak.keymap b/src/data/keymaps/Colemak.keymap
similarity index 100%
rename from src/data/etc/keymaps/Colemak.keymap
rename to src/data/keymaps/Colemak.keymap
diff --git a/src/data/etc/keymaps/Czech.keymap b/src/data/keymaps/Czech.keymap
similarity index 100%
rename from src/data/etc/keymaps/Czech.keymap
rename to src/data/keymaps/Czech.keymap
diff --git a/src/data/etc/keymaps/Danish.keymap b/src/data/keymaps/Danish.keymap
similarity index 100%
rename from src/data/etc/keymaps/Danish.keymap
rename to src/data/keymaps/Danish.keymap
diff --git a/src/data/etc/keymaps/Dutch.keymap b/src/data/keymaps/Dutch.keymap
similarity index 100%
rename from src/data/etc/keymaps/Dutch.keymap
rename to src/data/keymaps/Dutch.keymap
diff --git a/src/data/etc/keymaps/Dvorak.keymap b/src/data/keymaps/Dvorak.keymap
similarity index 100%
rename from src/data/etc/keymaps/Dvorak.keymap
rename to src/data/keymaps/Dvorak.keymap
diff --git a/src/data/etc/keymaps/Estonian.keymap b/src/data/keymaps/Estonian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Estonian.keymap
rename to src/data/keymaps/Estonian.keymap
diff --git a/src/data/etc/keymaps/Faeroese.keymap b/src/data/keymaps/Faeroese.keymap
similarity index 100%
rename from src/data/etc/keymaps/Faeroese.keymap
rename to src/data/keymaps/Faeroese.keymap
diff --git a/src/data/etc/keymaps/French (Mac).keymap b/src/data/keymaps/French (Mac).keymap
similarity index 100%
rename from src/data/etc/keymaps/French (Mac).keymap
rename to src/data/keymaps/French (Mac).keymap
diff --git a/src/data/etc/keymaps/French.keymap b/src/data/keymaps/French.keymap
similarity index 100%
rename from src/data/etc/keymaps/French.keymap
rename to src/data/keymaps/French.keymap
diff --git a/src/data/etc/keymaps/German.keymap b/src/data/keymaps/German.keymap
similarity index 100%
rename from src/data/etc/keymaps/German.keymap
rename to src/data/keymaps/German.keymap
diff --git a/src/data/etc/keymaps/Greek.keymap b/src/data/keymaps/Greek.keymap
similarity index 100%
rename from src/data/etc/keymaps/Greek.keymap
rename to src/data/keymaps/Greek.keymap
diff --git a/src/data/etc/keymaps/Hebrew.keymap b/src/data/keymaps/Hebrew.keymap
similarity index 100%
rename from src/data/etc/keymaps/Hebrew.keymap
rename to src/data/keymaps/Hebrew.keymap
diff --git a/src/data/etc/keymaps/Hungarian.keymap b/src/data/keymaps/Hungarian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Hungarian.keymap
rename to src/data/keymaps/Hungarian.keymap
diff --git a/src/data/etc/keymaps/ISO-9995.keymap b/src/data/keymaps/ISO-9995.keymap
similarity index 100%
rename from src/data/etc/keymaps/ISO-9995.keymap
rename to src/data/keymaps/ISO-9995.keymap
diff --git a/src/data/etc/keymaps/Icelandic.keymap b/src/data/keymaps/Icelandic.keymap
similarity index 100%
rename from src/data/etc/keymaps/Icelandic.keymap
rename to src/data/keymaps/Icelandic.keymap
diff --git a/src/data/etc/keymaps/Irish.keymap b/src/data/keymaps/Irish.keymap
similarity index 100%
rename from src/data/etc/keymaps/Irish.keymap
rename to src/data/keymaps/Irish.keymap
diff --git a/src/data/etc/keymaps/Italian.keymap b/src/data/keymaps/Italian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Italian.keymap
rename to src/data/keymaps/Italian.keymap
diff --git a/src/data/etc/keymaps/Jamfile b/src/data/keymaps/Jamfile
similarity index 100%
rename from src/data/etc/keymaps/Jamfile
rename to src/data/keymaps/Jamfile
diff --git a/src/data/etc/keymaps/Japanese.keymap b/src/data/keymaps/Japanese.keymap
similarity index 100%
rename from src/data/etc/keymaps/Japanese.keymap
rename to src/data/keymaps/Japanese.keymap
diff --git a/src/data/etc/keymaps/Latin-American.keymap b/src/data/keymaps/Latin-American.keymap
similarity index 100%
rename from src/data/etc/keymaps/Latin-American.keymap
rename to src/data/keymaps/Latin-American.keymap
diff --git a/src/data/etc/keymaps/Lithuanian (Baltic).keymap b/src/data/keymaps/Lithuanian (Baltic).keymap
similarity index 100%
rename from src/data/etc/keymaps/Lithuanian (Baltic).keymap
rename to src/data/keymaps/Lithuanian (Baltic).keymap
diff --git a/src/data/etc/keymaps/Macedonian.keymap b/src/data/keymaps/Macedonian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Macedonian.keymap
rename to src/data/keymaps/Macedonian.keymap
diff --git a/src/data/etc/keymaps/Norwegian.keymap b/src/data/keymaps/Norwegian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Norwegian.keymap
rename to src/data/keymaps/Norwegian.keymap
diff --git a/src/data/etc/keymaps/Polish (programmer's).keymap b/src/data/keymaps/Polish (programmer's).keymap
similarity index 100%
rename from src/data/etc/keymaps/Polish (programmer's).keymap
rename to src/data/keymaps/Polish (programmer's).keymap
diff --git a/src/data/etc/keymaps/Polish.keymap b/src/data/keymaps/Polish.keymap
similarity index 100%
rename from src/data/etc/keymaps/Polish.keymap
rename to src/data/keymaps/Polish.keymap
diff --git a/src/data/etc/keymaps/Portuguese.keymap b/src/data/keymaps/Portuguese.keymap
similarity index 100%
rename from src/data/etc/keymaps/Portuguese.keymap
rename to src/data/keymaps/Portuguese.keymap
diff --git a/src/data/etc/keymaps/Romanian.keymap b/src/data/keymaps/Romanian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Romanian.keymap
rename to src/data/keymaps/Romanian.keymap
diff --git a/src/data/etc/keymaps/Russian.keymap b/src/data/keymaps/Russian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Russian.keymap
rename to src/data/keymaps/Russian.keymap
diff --git a/src/data/etc/keymaps/Serbian (Cyrillic).keymap b/src/data/keymaps/Serbian (Cyrillic).keymap
similarity index 100%
rename from src/data/etc/keymaps/Serbian (Cyrillic).keymap
rename to src/data/keymaps/Serbian (Cyrillic).keymap
diff --git a/src/data/etc/keymaps/Serbian (Latin).keymap b/src/data/keymaps/Serbian (Latin).keymap
similarity index 100%
rename from src/data/etc/keymaps/Serbian (Latin).keymap
rename to src/data/keymaps/Serbian (Latin).keymap
diff --git a/src/data/etc/keymaps/Slovak.keymap b/src/data/keymaps/Slovak.keymap
similarity index 100%
rename from src/data/etc/keymaps/Slovak.keymap
rename to src/data/keymaps/Slovak.keymap
diff --git a/src/data/etc/keymaps/Slovene.keymap b/src/data/keymaps/Slovene.keymap
similarity index 100%
rename from src/data/etc/keymaps/Slovene.keymap
rename to src/data/keymaps/Slovene.keymap
diff --git a/src/data/etc/keymaps/Spanish (Dvorak).keymap b/src/data/keymaps/Spanish (Dvorak).keymap
similarity index 100%
rename from src/data/etc/keymaps/Spanish (Dvorak).keymap
rename to src/data/keymaps/Spanish (Dvorak).keymap
diff --git a/src/data/etc/keymaps/Spanish.keymap b/src/data/keymaps/Spanish.keymap
similarity index 100%
rename from src/data/etc/keymaps/Spanish.keymap
rename to src/data/keymaps/Spanish.keymap
diff --git a/src/data/etc/keymaps/Svorak.keymap b/src/data/keymaps/Svorak.keymap
similarity index 100%
rename from src/data/etc/keymaps/Svorak.keymap
rename to src/data/keymaps/Svorak.keymap
diff --git a/src/data/etc/keymaps/Swedish.keymap b/src/data/keymaps/Swedish.keymap
similarity index 100%
rename from src/data/etc/keymaps/Swedish.keymap
rename to src/data/keymaps/Swedish.keymap
diff --git a/src/data/etc/keymaps/Swiss-French.keymap b/src/data/keymaps/Swiss-French.keymap
similarity index 100%
rename from src/data/etc/keymaps/Swiss-French.keymap
rename to src/data/keymaps/Swiss-French.keymap
diff --git a/src/data/etc/keymaps/Swiss-German.keymap b/src/data/keymaps/Swiss-German.keymap
similarity index 100%
rename from src/data/etc/keymaps/Swiss-German.keymap
rename to src/data/keymaps/Swiss-German.keymap
diff --git a/src/data/etc/keymaps/Turkish (Type-F).keymap b/src/data/keymaps/Turkish (Type-F).keymap
similarity index 100%
rename from src/data/etc/keymaps/Turkish (Type-F).keymap
rename to src/data/keymaps/Turkish (Type-F).keymap
diff --git a/src/data/etc/keymaps/Turkish (Type-Q).keymap b/src/data/keymaps/Turkish (Type-Q).keymap
similarity index 100%
rename from src/data/etc/keymaps/Turkish (Type-Q).keymap
rename to src/data/keymaps/Turkish (Type-Q).keymap
diff --git a/src/data/etc/keymaps/US-International.keymap b/src/data/keymaps/US-International.keymap
similarity index 100%
rename from src/data/etc/keymaps/US-International.keymap
rename to src/data/keymaps/US-International.keymap
diff --git a/src/data/etc/keymaps/Ukrainian.keymap b/src/data/keymaps/Ukrainian.keymap
similarity index 100%
rename from src/data/etc/keymaps/Ukrainian.keymap
rename to src/data/keymaps/Ukrainian.keymap
diff --git a/src/data/etc/keymaps/United-Kingdom.keymap b/src/data/keymaps/United-Kingdom.keymap
similarity index 100%
rename from src/data/etc/keymaps/United-Kingdom.keymap
rename to src/data/keymaps/United-Kingdom.keymap
diff --git a/src/data/etc/timezones/Jamfile b/src/data/timezones/Jamfile
similarity index 100%
rename from src/data/etc/timezones/Jamfile
rename to src/data/timezones/Jamfile
diff --git a/src/data/etc/timezones/africa b/src/data/timezones/africa
similarity index 100%
rename from src/data/etc/timezones/africa
rename to src/data/timezones/africa
diff --git a/src/data/etc/timezones/antarctica b/src/data/timezones/antarctica
similarity index 100%
rename from src/data/etc/timezones/antarctica
rename to src/data/timezones/antarctica
diff --git a/src/data/etc/timezones/asia b/src/data/timezones/asia
similarity index 100%
rename from src/data/etc/timezones/asia
rename to src/data/timezones/asia
diff --git a/src/data/etc/timezones/australasia b/src/data/timezones/australasia
similarity index 100%
rename from src/data/etc/timezones/australasia
rename to src/data/timezones/australasia
diff --git a/src/data/etc/timezones/backward b/src/data/timezones/backward
similarity index 100%
rename from src/data/etc/timezones/backward
rename to src/data/timezones/backward
diff --git a/src/data/etc/timezones/etcetera b/src/data/timezones/etcetera
similarity index 100%
rename from src/data/etc/timezones/etcetera
rename to src/data/timezones/etcetera
diff --git a/src/data/etc/timezones/europe b/src/data/timezones/europe
similarity index 100%
rename from src/data/etc/timezones/europe
rename to src/data/timezones/europe
diff --git a/src/data/etc/timezones/factory b/src/data/timezones/factory
similarity index 100%
rename from src/data/etc/timezones/factory
rename to src/data/timezones/factory
diff --git a/src/data/etc/timezones/iso3166.tab b/src/data/timezones/iso3166.tab
similarity index 100%
rename from src/data/etc/timezones/iso3166.tab
rename to src/data/timezones/iso3166.tab
diff --git a/src/data/etc/timezones/leapseconds b/src/data/timezones/leapseconds
similarity index 100%
rename from src/data/etc/timezones/leapseconds
rename to src/data/timezones/leapseconds
diff --git a/src/data/etc/timezones/northamerica b/src/data/timezones/northamerica
similarity index 100%
rename from src/data/etc/timezones/northamerica
rename to src/data/timezones/northamerica
diff --git a/src/data/etc/timezones/pacificnew b/src/data/timezones/pacificnew
similarity index 100%
rename from src/data/etc/timezones/pacificnew
rename to src/data/timezones/pacificnew
diff --git a/src/data/etc/timezones/solar87 b/src/data/timezones/solar87
similarity index 100%
rename from src/data/etc/timezones/solar87
rename to src/data/timezones/solar87
diff --git a/src/data/etc/timezones/solar88 b/src/data/timezones/solar88
similarity index 100%
rename from src/data/etc/timezones/solar88
rename to src/data/timezones/solar88
diff --git a/src/data/etc/timezones/solar89 b/src/data/timezones/solar89
similarity index 100%
rename from src/data/etc/timezones/solar89
rename to src/data/timezones/solar89
diff --git a/src/data/etc/timezones/southamerica b/src/data/timezones/southamerica
similarity index 100%
rename from src/data/etc/timezones/southamerica
rename to src/data/timezones/southamerica
diff --git a/src/data/etc/timezones/systemv b/src/data/timezones/systemv
similarity index 100%
rename from src/data/etc/timezones/systemv
rename to src/data/timezones/systemv
diff --git a/src/data/etc/timezones/yearistype.sh b/src/data/timezones/yearistype.sh
similarity index 100%
rename from src/data/etc/timezones/yearistype.sh
rename to src/data/timezones/yearistype.sh
diff --git a/src/data/etc/timezones/zone.tab b/src/data/timezones/zone.tab
similarity index 100%
rename from src/data/etc/timezones/zone.tab
rename to src/data/timezones/zone.tab