diff --git a/reference/XmlRpcCall/main.cpp b/reference/XmlRpcCall/main.cpp
index 0feb63388..5dd737d81 100644
--- a/reference/XmlRpcCall/main.cpp
+++ b/reference/XmlRpcCall/main.cpp
@@ -1,41 +1,41 @@
-#include <XmlRpc/XmlRpc.h>
-
-using namespace Upp;
-
-struct FoxResult {
-	bool   flerror;
-	double amount;
-	String message;
-	
-	void Map(ValueMapper& m) {
-		m("flerror", flerror)("amount", amount)("message", message);
-	}
-};
-
-XMLRPC_STRUCT(FoxResult)
-
-CONSOLE_APP_MAIN
-{
-	StdLogSetup(LOG_COUT|LOG_FILE);
-	XmlRpcRequest xr("http://foxrate.org/rpc");
-	xr.Method("foxrate.currencyConvert") << "USD" << "GBP" << 120;
-	Value v = xr.Execute();
-	if(v.IsError())
-		LOG("Error: " << v);
-	else
-		if(v["flerror"] == 0)
-			LOG(v["amount"]);
-		else
-			LOG("Failed.");
-
-	FoxResult r;
-	if(XmlRpcRequest("http://foxrate.org/rpc").Method("foxrate.currencyConvert")
-		  << "USD" << "GBP" << 120
-		  >> r)
-		if(r.flerror)
-			Cout() << "Server reported error\n";
-		else
-			Cout() << r.amount << '\n';
-	else 
-		Cout() << "Failed.\n";
-}
+#include <XmlRpc/XmlRpc.h>
+
+using namespace Upp;
+
+struct FoxResult {
+	bool   flerror;
+	double amount;
+	String message;
+	
+	void Map(ValueMapper& m) {
+		m("flerror", flerror)("amount", amount)("message", message);
+	}
+};
+
+XMLRPC_STRUCT(FoxResult)
+
+CONSOLE_APP_MAIN
+{
+	StdLogSetup(LOG_COUT|LOG_FILE);
+	XmlRpcRequest xr("http://foxrate.org/rpc");
+	xr.Method("foxrate.currencyConvert") << "USD" << "GBP" << 120;
+	Value v = xr.Execute();
+	if(v.IsError())
+		LOG("Error: " << v);
+	else
+		if(v["flerror"] == 0)
+			LOG(v["amount"]);
+		else
+			LOG("Failed.");
+
+	FoxResult r;
+	if(XmlRpcRequest("http://foxrate.org/rpc").Method("foxrate.currencyConvert")
+		  << "USD" << "GBP" << 120
+		  >> r)
+		if(r.flerror)
+			LOG("Server reported erro");
+		else
+			LOG(r.amount);
+	else 
+		LOG("Failed.");
+}
diff --git a/reference/XmlRpcClient/XmlRpcClient.cpp b/reference/XmlRpcClient/XmlRpcClient.cpp
index e0acc0257..57e01c0a9 100644
--- a/reference/XmlRpcClient/XmlRpcClient.cpp
+++ b/reference/XmlRpcClient/XmlRpcClient.cpp
@@ -1,28 +1,27 @@
-#include <XmlRpc/XmlRpc.h>
-
-using namespace Upp;
-
-
-void Compute(double a, String op, double b)
-{
-	double result;
-	Cout() << a << op << b << '=';
-	XmlRpcCall call("127.0.0.1:1234");
-	if(call("compute", a, op, b) >> result)
-	   	Cout() << result;
-	else
-		Cout() << " error: " << call.GetError();
-	Cout() << '\n';
-}
-
-CONSOLE_APP_MAIN
-{
-	Time tm;
-	XmlRpcCall("127.0.0.1:1234")("ping") >> tm;
-	Cout() << tm << '\n';	
-
-	Compute(12, "+", 12);
-	Compute(12, "*", 12);
-	Compute(12, "+56", 12);
-	Compute(12, "/", 0);
-}
+#include <Core/XmlRpc/XmlRpc.h>
+
+using namespace Upp;
+
+void Compute(double a, String op, double b)
+{
+	double result;
+	Cout() << a << op << b << '=';
+	XmlRpcRequest call("127.0.0.1:1234");
+	if(call("compute", a, op, b) >> result)
+	   	Cout() << result;
+	else
+		Cout() << " error: " << call.GetError();
+	Cout() << '\n';
+}
+
+CONSOLE_APP_MAIN
+{
+	Time tm;
+	XmlRpcRequest("127.0.0.1:1234")("ping") >> tm;
+	Cout() << tm << '\n';	
+
+	Compute(12, "+", 12);
+	Compute(12, "*", 12);
+	Compute(12, "+56", 12);
+	Compute(12, "/", 0);
+}
diff --git a/reference/XmlRpcClient/XmlRpcClient.upp b/reference/XmlRpcClient/XmlRpcClient.upp
index d90f021c7..7aa9e0c0a 100644
--- a/reference/XmlRpcClient/XmlRpcClient.upp
+++ b/reference/XmlRpcClient/XmlRpcClient.upp
@@ -2,7 +2,7 @@ description "Client for XmlRpcServer example\377";
 
 uses
 	Core,
-	XmlRpc;
+	Core/XmlRpc;
 
 file
 	XmlRpcClient.cpp;
diff --git a/reference/XmlRpcClient/init b/reference/XmlRpcClient/init
index 42cb7f228..bbde73e72 100644
--- a/reference/XmlRpcClient/init
+++ b/reference/XmlRpcClient/init
@@ -1,5 +1,5 @@
 #ifndef _XmlRpcClient_icpp_init_stub
 #define _XmlRpcClient_icpp_init_stub
 #include "Core/init"
-#include "XmlRpc/init"
+#include "Core/XmlRpc/init"
 #endif
diff --git a/reference/XmlRpcServer/XmlRpcSrvTst.cpp b/reference/XmlRpcServer/XmlRpcServer.cpp
similarity index 86%
rename from reference/XmlRpcServer/XmlRpcSrvTst.cpp
rename to reference/XmlRpcServer/XmlRpcServer.cpp
index 99dccde55..1d97e80a7 100644
--- a/reference/XmlRpcServer/XmlRpcSrvTst.cpp
+++ b/reference/XmlRpcServer/XmlRpcServer.cpp
@@ -1,43 +1,43 @@
-#include <XmlRpc/XmlRpc.h>
-
-using namespace Upp;
-
-XMLRPC_METHOD(compute)
-{
-	double a, b;
-	String op;
-	rpc >> a >> op >> b;
-	Cout() << "Request: " << a << op << b << '\n';
-	if(op.GetCount() == 1)
-	switch(*op) {
-	case '+':
-		rpc << a + b;
-		return;
-	case '-':
-		rpc << a - b;
-		return;
-	case '/':
-		if(b == 0)
-			rpc << ErrorValue("division by zero");
-		else
-			rpc << a / b;
-		return;
-	case '*':
-		rpc << a * b;
-		return;
-	}
-	rpc << ErrorValue("unknown operator");
-}
-
-XMLRPC_METHOD(ping)
-{
-	rpc << GetSysTime();
-}
-
-namespace Upp { extern bool HttpClient_Trace__; }
-
-CONSOLE_APP_MAIN
-{
-	Cout() << "Server..\n";
-	XmlRpcServer(1234);
-}
+#include <Core/XmlRpc/XmlRpc.h>
+
+using namespace Upp;
+
+XMLRPC_METHOD(compute)
+{
+	double a, b;
+	String op;
+	rpc >> a >> op >> b;
+	Cout() << "Request: " << a << op << b << '\n';
+	if(op.GetCount() == 1)
+	switch(*op) {
+	case '+':
+		rpc << a + b;
+		return;
+	case '-':
+		rpc << a - b;
+		return;
+	case '/':
+		if(b == 0)
+			rpc << ErrorValue("division by zero");
+		else
+			rpc << a / b;
+		return;
+	case '*':
+		rpc << a * b;
+		return;
+	}
+	rpc << ErrorValue("unknown operator");
+}
+
+XMLRPC_METHOD(ping)
+{
+	rpc << GetSysTime();
+}
+
+namespace Upp { extern bool HttpClient_Trace__; }
+
+CONSOLE_APP_MAIN
+{
+	Cout() << "Server..\n";
+	XmlRpcServerLoop(1234);
+}
diff --git a/reference/XmlRpcServer/XmlRpcServer.upp b/reference/XmlRpcServer/XmlRpcServer.upp
index 8e672a61b..c726d2b4a 100644
--- a/reference/XmlRpcServer/XmlRpcServer.upp
+++ b/reference/XmlRpcServer/XmlRpcServer.upp
@@ -2,10 +2,10 @@ description "XML-RPC simple server\377";
 
 uses
 	Core,
-	XmlRpc;
+	Core/XmlRpc;
 
 file
-	XmlRpcSrvTst.cpp;
+	XmlRpcServer.cpp;
 
 mainconfig
 	"" = "";
diff --git a/reference/XmlRpcServer/init b/reference/XmlRpcServer/init
index 45dc823a0..dca5eced5 100644
--- a/reference/XmlRpcServer/init
+++ b/reference/XmlRpcServer/init
@@ -1,5 +1,5 @@
-#ifndef _XmlRpcSrvTst_icpp_init_stub
-#define _XmlRpcSrvTst_icpp_init_stub
+#ifndef _XmlRpcServer_icpp_init_stub
+#define _XmlRpcServer_icpp_init_stub
 #include "Core/init"
-#include "XmlRpc/init"
+#include "Core/XmlRpc/init"
 #endif