diff --git a/build_tarball.sh b/build_tarball.sh
index 623bdc8eb0e87ffad4dee69dc46e4a2ce5637a26..b1d0c8dee32384ee97aba641fb531fd19d1168b6 100755
--- a/build_tarball.sh
+++ b/build_tarball.sh
@@ -32,7 +32,6 @@ rm -f *.tar.gz
rm -rf lang/
rm -rf tools/
rm -rf sflphone-client-kde/
-rm -rf sippxml
rm -rf .git/
rm -f .gitignore
diff --git a/sflphone-common/test/siptest.cpp b/sflphone-common/test/siptest.cpp
index eeaffa5051ffe71e53097d1400ee9d82a95ae90d..8fed03d09e37d0a5535de587cdbc906b20c1cea1 100644
--- a/sflphone-common/test/siptest.cpp
+++ b/sflphone-common/test/siptest.cpp
@@ -232,7 +232,7 @@ void SIPTest::testTwoOutgoingIpCall ()
void *status;
// This scenario expect to be put on hold before hangup
- std::string firstCallCommand("sipp -sf sippxml/test_1.xml -i 127.0.0.1 -p 5062 -m 1");
+ std::string firstCallCommand("sipp -sf tools/sippxml/test_1.xml -i 127.0.0.1 -p 5062 -m 1");
// The second call uses the default user agent scenario
std::string secondCallCommand("sipp -sn uas -i 127.0.0.1 -p 5064 -m 1");
@@ -302,7 +302,7 @@ void SIPTest::testTwoIncomingIpCall ()
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
// the first call is supposed to be put on hold when answering teh second incoming call
- std::string firstCallCommand("sipp -sf sippxml/test_2.xml 127.0.0.1 -i 127.0.0.1 -p 5064 -m 1 > testfile1.txt");
+ std::string firstCallCommand("sipp -sf tools/sippxml/test_2.xml 127.0.0.1 -i 127.0.0.1 -p 5064 -m 1 > testfile1.txt");
// command to be executed by the thread, user agent client which initiate a call and hangup
std::string secondCallCommand("sipp -sn uac 127.0.0.1 -i 127.0.0.1 -p 5062 -m 1 -d 250 > testfile2.txt");
@@ -377,7 +377,7 @@ void SIPTest::testHoldIpCall()
{
pthread_t callThread;
- std::string callCommand("sipp -sf sippxml/test_3.xml -i 127.0.0.1 -p 5062 -m 1");
+ std::string callCommand("sipp -sf tools/sippxml/test_3.xml -i 127.0.0.1 -p 5062 -m 1");
int rc = pthread_create(&callThread, NULL, sippThread, (void *)(&callCommand));
if(rc) {
@@ -415,7 +415,7 @@ void SIPTest::testIncomingIpCallSdp ()
void *status;
// command to be executed by the thread, user agent client which initiate a call and hangup
- std::string command("sipp -sf sippxml/test_4.xml 127.0.0.1 -i 127.0.0.1 -p 5062 -m 1");
+ std::string command("sipp -sf tools/sippxml/test_4.xml 127.0.0.1 -i 127.0.0.1 -p 5062 -m 1");
int rc = pthread_create(&thethread, NULL, sippThread, (void *)(&command));
if (rc) {
diff --git a/sippxml/account_uac_send_hangup.xml b/tools/sippxml/account_uac_send_hangup.xml
similarity index 100%
rename from sippxml/account_uac_send_hangup.xml
rename to tools/sippxml/account_uac_send_hangup.xml
diff --git a/sippxml/account_uac_send_peer_hungup.xml b/tools/sippxml/account_uac_send_peer_hungup.xml
similarity index 100%
rename from sippxml/account_uac_send_peer_hungup.xml
rename to tools/sippxml/account_uac_send_peer_hungup.xml
diff --git a/sippxml/account_uas_receive_transfer.xml b/tools/sippxml/account_uas_receive_transfer.xml
similarity index 100%
rename from sippxml/account_uas_receive_transfer.xml
rename to tools/sippxml/account_uas_receive_transfer.xml
diff --git a/sippxml/account_uas_recv_hangup.xml b/tools/sippxml/account_uas_recv_hangup.xml
similarity index 100%
rename from sippxml/account_uas_recv_hangup.xml
rename to tools/sippxml/account_uas_recv_hangup.xml
diff --git a/sippxml/account_uas_recv_peer_hungup.xml b/tools/sippxml/account_uas_recv_peer_hungup.xml
similarity index 100%
rename from sippxml/account_uas_recv_peer_hungup.xml
rename to tools/sippxml/account_uas_recv_peer_hungup.xml
diff --git a/sippxml/account_uas_recv_transfered.xml b/tools/sippxml/account_uas_recv_transfered.xml
similarity index 100%
rename from sippxml/account_uas_recv_transfered.xml
rename to tools/sippxml/account_uas_recv_transfered.xml
diff --git a/sippxml/account_uas_register.xml b/tools/sippxml/account_uas_register.xml
similarity index 100%
rename from sippxml/account_uas_register.xml
rename to tools/sippxml/account_uas_register.xml
diff --git a/sippxml/accountcalluac.xml b/tools/sippxml/accountcalluac.xml
similarity index 100%
rename from sippxml/accountcalluac.xml
rename to tools/sippxml/accountcalluac.xml
diff --git a/sippxml/accountcalluas.xml b/tools/sippxml/accountcalluas.xml
similarity index 100%
rename from sippxml/accountcalluas.xml
rename to tools/sippxml/accountcalluas.xml
diff --git a/sippxml/g711a.pcap b/tools/sippxml/g711a.pcap
similarity index 100%
rename from sippxml/g711a.pcap
rename to tools/sippxml/g711a.pcap
diff --git a/sippxml/ip2ip_uac_send_hangup.xml b/tools/sippxml/ip2ip_uac_send_hangup.xml
similarity index 100%
rename from sippxml/ip2ip_uac_send_hangup.xml
rename to tools/sippxml/ip2ip_uac_send_hangup.xml
diff --git a/sippxml/ip2ip_uac_send_peer_hungup.xml b/tools/sippxml/ip2ip_uac_send_peer_hungup.xml
similarity index 100%
rename from sippxml/ip2ip_uac_send_peer_hungup.xml
rename to tools/sippxml/ip2ip_uac_send_peer_hungup.xml
diff --git a/sippxml/ip2ip_uas_recv_hangup.xml b/tools/sippxml/ip2ip_uas_recv_hangup.xml
similarity index 100%
rename from sippxml/ip2ip_uas_recv_hangup.xml
rename to tools/sippxml/ip2ip_uas_recv_hangup.xml
diff --git a/sippxml/ip2ip_uas_recv_hold_offhold.xml b/tools/sippxml/ip2ip_uas_recv_hold_offhold.xml
similarity index 100%
rename from sippxml/ip2ip_uas_recv_hold_offhold.xml
rename to tools/sippxml/ip2ip_uas_recv_hold_offhold.xml
diff --git a/sippxml/ip2ip_uas_recv_peer_hungup.xml b/tools/sippxml/ip2ip_uas_recv_peer_hungup.xml
similarity index 100%
rename from sippxml/ip2ip_uas_recv_peer_hungup.xml
rename to tools/sippxml/ip2ip_uas_recv_peer_hungup.xml
diff --git a/sippxml/ip2ipcalluac.xml b/tools/sippxml/ip2ipcalluac.xml
similarity index 100%
rename from sippxml/ip2ipcalluac.xml
rename to tools/sippxml/ip2ipcalluac.xml
diff --git a/sippxml/ip2ipcalluas.xml b/tools/sippxml/ip2ipcalluas.xml
similarity index 100%
rename from sippxml/ip2ipcalluas.xml
rename to tools/sippxml/ip2ipcalluas.xml
diff --git a/sippxml/simpleServiceRoute.xml b/tools/sippxml/simpleServiceRoute.xml
similarity index 100%
rename from sippxml/simpleServiceRoute.xml
rename to tools/sippxml/simpleServiceRoute.xml
diff --git a/sippxml/sippusage.txt b/tools/sippxml/sippusage.txt
similarity index 100%
rename from sippxml/sippusage.txt
rename to tools/sippxml/sippusage.txt
diff --git a/sippxml/tempscript.sh b/tools/sippxml/tempscript.sh
similarity index 100%
rename from sippxml/tempscript.sh
rename to tools/sippxml/tempscript.sh
diff --git a/sippxml/testEarlyMedia.xml b/tools/sippxml/testEarlyMedia.xml
similarity index 100%
rename from sippxml/testEarlyMedia.xml
rename to tools/sippxml/testEarlyMedia.xml
diff --git a/sippxml/testsuiteuac.sh b/tools/sippxml/testsuiteuac.sh
similarity index 100%
rename from sippxml/testsuiteuac.sh
rename to tools/sippxml/testsuiteuac.sh
diff --git a/sippxml/voice b/tools/sippxml/voice
similarity index 100%
rename from sippxml/voice
rename to tools/sippxml/voice