diff --git a/keyboard.go b/ghid/keyboard.go
similarity index 100%
rename from keyboard.go
rename to ghid/keyboard.go
diff --git a/hid/dvorak.json b/keymaps/dvorak.json
similarity index 100%
rename from hid/dvorak.json
rename to keymaps/dvorak.json
diff --git a/hid/qwerty.json b/keymaps/qwerty.json
similarity index 100%
rename from hid/qwerty.json
rename to keymaps/qwerty.json
diff --git a/hid/tengwar-f.json b/keymaps/tengwar-f.json
similarity index 100%
rename from hid/tengwar-f.json
rename to keymaps/tengwar-f.json
diff --git a/hid/tengwar-u.json b/keymaps/tengwar-u.json
similarity index 100%
rename from hid/tengwar-u.json
rename to keymaps/tengwar-u.json
diff --git a/hid/tiro.json b/keymaps/tiro.json
similarity index 100%
rename from hid/tiro.json
rename to keymaps/tiro.json
diff --git a/cmd/main.go b/main.go
similarity index 100%
rename from cmd/main.go
rename to main.go