diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_connection_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_connection_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_request_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_request_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_request_handler_factory.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/none/httpd_request_handler_factory.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/none/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_connection_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_connection_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_request_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_request_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_request_handler_factory.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/httpd_request_handler_factory.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool_factory.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool_item.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_item.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/scoop/pool/concurrent_pool_item.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/scoop/pool/concurrent_pool_item.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_connection_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_connection_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_connection_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_connection_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_request_handler.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_request_handler.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_request_handler_factory.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler_factory.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/httpd_request_handler_factory.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/httpd_request_handler_factory.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/pool/pooled_thread.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/pooled_thread.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/pool/pooled_thread.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/pooled_thread.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/pool/thread_pool.e b/library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/thread_pool.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/concurrency/thread/pool/thread_pool.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/concurrency/thread/pool/thread_pool.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/configuration/httpd_configuration_i.e b/library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_configuration_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/configuration/httpd_configuration_i.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_configuration_i.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/configuration/httpd_request_settings.e b/library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_request_settings.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/configuration/httpd_request_settings.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/configuration/httpd_request_settings.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd-safe.ecf
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd-safe.ecf
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd.ecf
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd.ecf
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_connection_handler_i.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_connection_handler_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_connection_handler_i.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_connection_handler_i.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_controller.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_controller.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_controller.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_controller.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_debug_facilities.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_debug_facilities.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_debug_facilities.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_debug_facilities.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_logger.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_logger.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_logger_constants.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger_constants.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_logger_constants.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_logger_constants.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_request_handler_factory_i.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_factory_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_request_handler_factory_i.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_factory_i.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_request_handler_i.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_request_handler_i.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_request_handler_i.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_server_i.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_i.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_server_i.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_i.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/httpd_server_observer.e b/library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_observer.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/httpd_server_observer.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/httpd_server_observer.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/network/httpd_stream_socket.e b/library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/network/httpd_stream_socket.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/network/httpd_stream_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/network/tcp_stream_socket.e b/library/server/ewsgi/connectors/standalone/lib/httpd/network/tcp_stream_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/network/tcp_stream_socket.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/network/tcp_stream_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/no_ssl/httpd_configuration.e b/library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_configuration.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/no_ssl/httpd_configuration.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_configuration.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/no_ssl/httpd_server.e b/library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_server.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/no_ssl/httpd_server.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/no_ssl/httpd_server.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/package.iron b/library/server/ewsgi/connectors/standalone/lib/httpd/package.iron
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/package.iron
rename to library/server/ewsgi/connectors/standalone/lib/httpd/package.iron
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_configuration.e b/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_configuration.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_configuration.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_configuration.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_server.e b/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_server.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_server.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_server.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_stream_ssl_socket.e b/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_stream_ssl_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/ssl/httpd_stream_ssl_socket.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/ssl/httpd_stream_ssl_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/src/httpd/ssl/ssl_tcp_stream_socket.e b/library/server/ewsgi/connectors/standalone/lib/httpd/ssl/ssl_tcp_stream_socket.e
similarity index 100%
rename from library/server/ewsgi/connectors/standalone/src/httpd/ssl/ssl_tcp_stream_socket.e
rename to library/server/ewsgi/connectors/standalone/lib/httpd/ssl/ssl_tcp_stream_socket.e
diff --git a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
index cbb239d9..84514c66 100644
--- a/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone-safe.ecf
@@ -16,7 +16,7 @@
 		<library name="encoder" location="..\..\..\..\text\encoder\encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http-safe.ecf"/>
-		<library name="httpd" location="src\httpd\httpd-safe.ecf" readonly="false"/>
+		<library name="httpd" location="lib\httpd\httpd-safe.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\">
 			<cluster name="implementation" location="$|implementation\" hidden="true"/>
 		</cluster>
diff --git a/library/server/ewsgi/connectors/standalone/standalone.ecf b/library/server/ewsgi/connectors/standalone/standalone.ecf
index 4fd3418b..89c4189e 100644
--- a/library/server/ewsgi/connectors/standalone/standalone.ecf
+++ b/library/server/ewsgi/connectors/standalone/standalone.ecf
@@ -15,7 +15,7 @@
 		<library name="encoder" location="..\..\..\..\text\encoder\encoder.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="http" location="..\..\..\..\network\protocol\http\http.ecf"/>
-		<library name="httpd" location="src\httpd\httpd.ecf" readonly="false"/>
+		<library name="httpd" location="lib\httpd\httpd.ecf" readonly="false"/>
 		<cluster name="src" location=".\src\">
 			<cluster name="implementation" location="$|implementation\" hidden="true"/>
 		</cluster>
diff --git a/tests/all-safe.ecf b/tests/all-safe.ecf
index 22204869..727ff927 100644
--- a/tests/all-safe.ecf
+++ b/tests/all-safe.ecf
@@ -31,7 +31,7 @@
 		<library name="filter" location="..\examples\filter\filter-safe.ecf" readonly="false"/>
 		<library name="hello_world" location="..\library\server\ewsgi\examples\hello_world\hello-safe.ecf" readonly="false"/>
 		<library name="http" location="..\library\network\protocol\http\http-safe.ecf" readonly="false"/>
-		<library name="httpd" location="..\library\server\httpd\httpd-safe.ecf" readonly="false"/>
+		<library name="httpd" location="..\library\server\ewsgi\connectors\standalone\lib\httpd\httpd-safe.ecf" readonly="false"/>
 		<library name="http_authorization" location="..\library\server\authentication\http_authorization\http_authorization-safe.ecf" readonly="false"/>
 		<library name="http_client" location="..\library\network\http_client\http_client-safe.ecf" readonly="false"/>
 		<library name="libfcgi" location="..\library\server\libfcgi\libfcgi-safe.ecf" readonly="false"/>