diff --git a/htdocs/webservices_client.php b/htdocs/webservices/client.php
similarity index 91%
rename from htdocs/webservices_client.php
rename to htdocs/webservices/client.php
index a1773b05a60..40d286243dd 100644
--- a/htdocs/webservices_client.php
+++ b/htdocs/webservices/client.php
@@ -20,56 +20,56 @@
*/
/**
- \file htdocs/webservices_client.php
+ \file htdocs/webservices/client.php
\brief Page demo client appel WebServices Dolibarr
\version $Revision$
-*/
+*/
-require_once("./master.inc.php");
+require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-
-$WS_DOL_URL = $dolibarr_main_url_root.'/webservices.php';
-$WS_METHOD = 'getVersions';
-
-// Set the parameters to send to the WebService
-$parameters = array("param1"=>"value1");
-
-// Set the WebService URL
-dolibarr_syslog("Create soapclient for URL=".$WS_DOL_URL);
-$soapclient = new soapclient($WS_DOL_URL);
-if ($soapclient)
-{
-
-}
-
-// Call the WebService method and store its result in $result.
-dolibarr_syslog("Call method ".$WS_METHOD);
-$result = $soapclient->call($WS_METHOD,$parameters);
-
-// Show page with result
+
+$WS_DOL_URL = $dolibarr_main_url_root.'/webservices/server.php';
+$WS_METHOD = 'getVersions';
+
+// Set the parameters to send to the WebService
+$parameters = array("param1"=>"value1");
+
+// Set the WebService URL
+dolibarr_syslog("Create soapclient for URL=".$WS_DOL_URL);
+$soapclient = new soapclient($WS_DOL_URL);
+if ($soapclient)
+{
+
+}
+
+// Call the WebService method and store its result in $result.
+dolibarr_syslog("Call method ".$WS_METHOD);
+$result = $soapclient->call($WS_METHOD,$parameters);
+
+// Show page with result
header("Content-type: text/html; charset=utf8");
print ''."\n";
-echo ''."\n";
-echo '';
-echo 'WebService Test: '.$WS_METHOD.'';
-echo ''."\n";
-
-echo ''."\n";
-
-echo "Question
";
-echo 'Function
';
-echo $WS_METHOD;
-echo 'Request
';
-echo '' . htmlspecialchars($client->request, ENT_QUOTES) . '
';
-
-echo "Réponse
";
-echo 'Result
';
-echo '';
-print_r($result);
+echo ''."\n";
+echo '';
+echo 'WebService Test: '.$WS_METHOD.'';
+echo ''."\n";
+
+echo ''."\n";
+
+echo "Question
";
+echo 'Function
';
+echo $WS_METHOD;
+echo 'Request
';
+echo '' . htmlspecialchars($client->request, ENT_QUOTES) . '
';
+
+echo "Réponse
";
+echo 'Result
';
+echo '';
+print_r($result);
echo '
';
-echo 'Response
';
-echo '' . htmlspecialchars($client->response, ENT_QUOTES) . '
';
-
-echo ''."\n";;
+echo 'Response
';
+echo '' . htmlspecialchars($client->response, ENT_QUOTES) . '
';
+
+echo ''."\n";;
echo ''."\n";;
-?>
+?>
diff --git a/htdocs/webservices.php b/htdocs/webservices/server.php
similarity index 66%
rename from htdocs/webservices.php
rename to htdocs/webservices/server.php
index 469593679e2..673f0b9b688 100644
--- a/htdocs/webservices.php
+++ b/htdocs/webservices/server.php
@@ -20,30 +20,47 @@
*/
/**
- \file htdocs/webservices.php
+ \file htdocs/webservices/server.php
\brief Fichier point entrée des WebServices Dolibarr
\version $Revision$
*/
-require_once("./master.inc.php");
+require_once("../master.inc.php");
require_once(NUSOAP_PATH.'/nusoap.php'); // Include SOAP
-
dolibarr_syslog("Call Dolibarr webservices interfaces");
-// Create the soap Object
-$s = new soap_server;
-// Register a method available for clients
-$s->register('getVersions');
+// Create the soap Object
+$server = new soap_server();
+$ns='dolibarr';
+$server->configureWSDL('WebServicesDolibarr',$ns);
+$server->wsdl->schemaTargetNamespace=$ns;
+
+
+// Register methods available for clients
+/*
+$server->register('getVersions',
+array(), // Tableau parametres entrée
+array('result' => 'xsd:array'), // Tableau parametres sortie
+$ns);
+*/
+
+$server->register('getVersions',
+// Tableau parametres entrée
+array(),
+// Tableau parametres sortie
+array('dolibarr'=>'xsd:string','mysql'=>'xsd:string','apache'=>'xsd:string'),
+$ns);
+
+
// Return the results.
-$s->service($HTTP_RAW_POST_DATA);
-
-
+$server->service($HTTP_RAW_POST_DATA);
+// Full methods code
function getVersions()
{
dolibarr_syslog("Function: getVersions");