diff --git a/library/server/ewsgi/src/application/wgi_agent_application.e b/library/server/ewsgi/src/wgi_agent_application.e
similarity index 100%
rename from library/server/ewsgi/src/application/wgi_agent_application.e
rename to library/server/ewsgi/src/wgi_agent_application.e
diff --git a/library/server/ewsgi/src/application/wgi_application.e b/library/server/ewsgi/src/wgi_application.e
similarity index 100%
rename from library/server/ewsgi/src/application/wgi_application.e
rename to library/server/ewsgi/src/wgi_application.e
diff --git a/library/server/ewsgi/src/stream/wgi_input_stream.e b/library/server/ewsgi/src/wgi_input_stream.e
similarity index 100%
rename from library/server/ewsgi/src/stream/wgi_input_stream.e
rename to library/server/ewsgi/src/wgi_input_stream.e
diff --git a/library/server/ewsgi/src/stream/wgi_output_stream.e b/library/server/ewsgi/src/wgi_output_stream.e
similarity index 100%
rename from library/server/ewsgi/src/stream/wgi_output_stream.e
rename to library/server/ewsgi/src/wgi_output_stream.e
diff --git a/library/server/ewsgi/src/request/wgi_request_from_table.e b/library/server/ewsgi/src/wgi_request_from_table.e
similarity index 100%
rename from library/server/ewsgi/src/request/wgi_request_from_table.e
rename to library/server/ewsgi/src/wgi_request_from_table.e
diff --git a/library/server/ewsgi/src/response/wgi_response_stream_buffer.e b/library/server/ewsgi/src/wgi_response_stream_buffer.e
similarity index 100%
rename from library/server/ewsgi/src/response/wgi_response_stream_buffer.e
rename to library/server/ewsgi/src/wgi_response_stream_buffer.e