diff --git a/include/kiwmi/commands.h b/include/commands.h
similarity index 100%
rename from include/kiwmi/commands.h
rename to include/commands.h
diff --git a/include/kiwmi/desktop/desktop.h b/include/desktop/desktop.h
similarity index 100%
rename from include/kiwmi/desktop/desktop.h
rename to include/desktop/desktop.h
diff --git a/include/kiwmi/desktop/output.h b/include/desktop/output.h
similarity index 100%
rename from include/kiwmi/desktop/output.h
rename to include/desktop/output.h
diff --git a/include/kiwmi/frontend.h b/include/frontend.h
similarity index 100%
rename from include/kiwmi/frontend.h
rename to include/frontend.h
diff --git a/include/kiwmi/input/cursor.h b/include/input/cursor.h
similarity index 100%
rename from include/kiwmi/input/cursor.h
rename to include/input/cursor.h
diff --git a/include/kiwmi/input/input.h b/include/input/input.h
similarity index 100%
rename from include/kiwmi/input/input.h
rename to include/input/input.h
diff --git a/include/kiwmi/input/keyboard.h b/include/input/keyboard.h
similarity index 100%
rename from include/kiwmi/input/keyboard.h
rename to include/input/keyboard.h
diff --git a/include/kiwmi/server.h b/include/server.h
similarity index 100%
rename from include/kiwmi/server.h
rename to include/server.h