diff --git a/ChangeLog b/ChangeLog
index 8d19814..878828d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+2012-02-10 06:36:43 +0100 Georg Hopp 
+
+	* moved request_parser.h and request_queue.h in separeate request subfolder (HEAD, master)
+
 2012-02-10 06:22:39 +0100 Georg Hopp 
 
-	* fix rather nasty reentrance bug (HEAD, master)
+	* fix rather nasty reentrance bug
 
 2012-02-10 05:52:50 +0100 Georg Hopp 
 
diff --git a/include/http/request_parser.h b/include/http/request/parser.h
similarity index 91%
rename from include/http/request_parser.h
rename to include/http/request/parser.h
index ef24139..887e421 100644
--- a/include/http/request_parser.h
+++ b/include/http/request/parser.h
@@ -2,7 +2,8 @@
 #define __HTTP_REQUEST_PARSER_H__
 
 #include "class.h"
-#include "http/request_queue.h"
+#include "http/request.h"
+#include "http/request/queue.h"
 
 #define HTTP_REQUEST_PARSER_READ_CHUNK	1024
 
diff --git a/include/http/request_queue.h b/include/http/request/queue.h
similarity index 100%
rename from include/http/request_queue.h
rename to include/http/request/queue.h
diff --git a/src/http/request/parser.c b/src/http/request/parser.c
index f8080a0..2ac415c 100644
--- a/src/http/request/parser.c
+++ b/src/http/request/parser.c
@@ -4,11 +4,12 @@
 #include <sys/types.h>
 
 #include "class.h"
-#include "http/request_parser.h"
 #include "interface/class.h"
 #include "interface/stream_reader.h"
+
+#include "http/request/parser.h"
+#include "http/request/queue.h"
 #include "http/request.h"
-#include "http/request_queue.h"
 
 void httpRequestParserParse(HttpRequestParser);
 
diff --git a/src/http/request/parser/parse.c b/src/http/request/parser/parse.c
index 79884eb..f865728 100644
--- a/src/http/request/parser/parse.c
+++ b/src/http/request/parser/parse.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 #include <ctype.h>
 
-#include "http/request_parser.h"
+#include "http/request/parser.h"
 #include "interface/class.h"
 
 
diff --git a/src/http/request/queue.c b/src/http/request/queue.c
index 17639cc..02c3ca0 100644
--- a/src/http/request/queue.c
+++ b/src/http/request/queue.c
@@ -3,7 +3,7 @@
 #include "class.h"
 #include "interface/class.h"
 
-#include "http/request_queue.h"
+#include "http/request/queue.h"
 
 static
 void
diff --git a/src/server/run.c b/src/server/run.c
index 6b5248b..af7e112 100644
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -15,8 +15,8 @@
 
 //* @TODO: to be removed
 #include "http/request.h"
-#include "http/request_parser.h"
-#include "http/request_queue.h"
+#include "http/request/parser.h"
+#include "http/request/queue.h"
 //* until here
 
 #undef  MAX
diff --git a/src/testserver.c b/src/testserver.c
index 0ad825e..eacdb85 100644
--- a/src/testserver.c
+++ b/src/testserver.c
@@ -7,7 +7,7 @@
 
 #include "server.h"
 #include "logger.h"
-#include "http/request_parser.h"
+#include "http/request/parser.h"
 
 #include "signalHandling.h"