diff --git a/library/server/ewsgi/specification/ewsgi_connector.e b/library/server/ewsgi/specification/connector/ewsgi_connector.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_connector.e
rename to library/server/ewsgi/specification/connector/ewsgi_connector.e
diff --git a/library/server/ewsgi/specification/ewsgi_cookie.e b/library/server/ewsgi/specification/request/ewsgi_cookie.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_cookie.e
rename to library/server/ewsgi/specification/request/ewsgi_cookie.e
diff --git a/library/server/ewsgi/specification/ewsgi_environment.e b/library/server/ewsgi/specification/request/ewsgi_environment.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_environment.e
rename to library/server/ewsgi/specification/request/ewsgi_environment.e
diff --git a/library/server/ewsgi/specification/ewsgi_environment_names.e b/library/server/ewsgi/specification/request/ewsgi_environment_names.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_environment_names.e
rename to library/server/ewsgi/specification/request/ewsgi_environment_names.e
diff --git a/library/server/ewsgi/specification/ewsgi_request.e b/library/server/ewsgi/specification/request/ewsgi_request.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_request.e
rename to library/server/ewsgi/specification/request/ewsgi_request.e
diff --git a/library/server/ewsgi/specification/ewsgi_uploaded_file_data.e b/library/server/ewsgi/specification/request/ewsgi_uploaded_file_data.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_uploaded_file_data.e
rename to library/server/ewsgi/specification/request/ewsgi_uploaded_file_data.e
diff --git a/library/server/ewsgi/specification/ewsgi_variables.e b/library/server/ewsgi/specification/request/ewsgi_variables.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_variables.e
rename to library/server/ewsgi/specification/request/ewsgi_variables.e
diff --git a/library/server/ewsgi/specification/ewsgi_response.e b/library/server/ewsgi/specification/response/ewsgi_response.e
similarity index 100%
rename from library/server/ewsgi/specification/ewsgi_response.e
rename to library/server/ewsgi/specification/response/ewsgi_response.e