diff --git a/Makefile b/Makefile
index c8b5756..3da4371 100644
--- a/Makefile
+++ b/Makefile
@@ -28,8 +28,8 @@ dist:
 		$(PACKAGE)-$(VERSION)/include/Makefile \
 		$(PACKAGE)-$(VERSION)/include/project.conf \
 		$(PACKAGE)-$(VERSION)/include/System/App.h \
-		$(PACKAGE)-$(VERSION)/include/System/appclient.h \
-		$(PACKAGE)-$(VERSION)/include/System/appserver.h \
+		$(PACKAGE)-$(VERSION)/include/System/App/appclient.h \
+		$(PACKAGE)-$(VERSION)/include/System/App/appserver.h \
 		$(PACKAGE)-$(VERSION)/include/System/Makefile \
 		$(PACKAGE)-$(VERSION)/include/System/project.conf \
 		$(PACKAGE)-$(VERSION)/src/appclient.c \
diff --git a/include/System/App.h b/include/System/App.h
index 26ae1da..92f0e2c 100644
--- a/include/System/App.h
+++ b/include/System/App.h
@@ -19,7 +19,7 @@
 # define LIBAPP_APP_H
 
 
-# include "System/appclient.h"
-# include "System/appserver.h"
+# include "App/appclient.h"
+# include "App/appserver.h"
 
 #endif /* !LIBAPP_APP_H */
diff --git a/include/System/appclient.h b/include/System/App/appclient.h
similarity index 100%
rename from include/System/appclient.h
rename to include/System/App/appclient.h
diff --git a/include/System/appserver.h b/include/System/App/appserver.h
similarity index 100%
rename from include/System/appserver.h
rename to include/System/App/appserver.h
diff --git a/include/System/Makefile b/include/System/Makefile
index ac56074..e98197d 100644
--- a/include/System/Makefile
+++ b/include/System/Makefile
@@ -17,13 +17,13 @@ install:
 	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System
 	$(INSTALL) -m 0644 -- App.h $(DESTDIR)$(INCLUDEDIR)/System/App.h
 	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System
-	$(INSTALL) -m 0644 -- appclient.h $(DESTDIR)$(INCLUDEDIR)/System/appclient.h
+	$(INSTALL) -m 0644 -- App/appclient.h $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h
 	$(MKDIR) $(DESTDIR)$(INCLUDEDIR)/System
-	$(INSTALL) -m 0644 -- appserver.h $(DESTDIR)$(INCLUDEDIR)/System/appserver.h
+	$(INSTALL) -m 0644 -- App/appserver.h $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h
 
 uninstall:
 	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/appclient.h
-	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/appserver.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appclient.h
+	$(RM) -- $(DESTDIR)$(INCLUDEDIR)/System/App/appserver.h
 
 .PHONY: all clean distclean install uninstall
diff --git a/include/System/project.conf b/include/System/project.conf
index 4459bf2..ed2773c 100644
--- a/include/System/project.conf
+++ b/include/System/project.conf
@@ -1,11 +1,11 @@
-includes=App.h,appclient.h,appserver.h
+includes=App.h,App/appclient.h,App/appserver.h
 dist=Makefile
 
 [App.h]
 install=$(INCLUDEDIR)/System
 
-[appclient.h]
+[App/appclient.h]
 install=$(INCLUDEDIR)/System
 
-[appserver.h]
+[App/appserver.h]
 install=$(INCLUDEDIR)/System