diff --git a/libretroshare/src/chat/rschatitems.cc b/libretroshare/src/chat/rschatitems.cc
index 06bb063a7..2b7dd67d8 100644
--- a/libretroshare/src/chat/rschatitems.cc
+++ b/libretroshare/src/chat/rschatitems.cc
@@ -29,7 +29,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #include "chat/rschatitems.h"
 
diff --git a/libretroshare/src/chat/rschatitems.h b/libretroshare/src/chat/rschatitems.h
index 06de87c7f..ddc0a2b86 100644
--- a/libretroshare/src/chat/rschatitems.h
+++ b/libretroshare/src/chat/rschatitems.h
@@ -27,7 +27,7 @@
 
 #include "openssl/bn.h"
 #include "retroshare/rstypes.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 #include "serialiser/rstlvkeys.h"
 #include "rsitems/rsserviceids.h"
 #include "rsitems/itempriorities.h"
diff --git a/libretroshare/src/file_sharing/rsfilelistitems.cc b/libretroshare/src/file_sharing/rsfilelistitems.cc
index 6934f29d2..7d91549d4 100644
--- a/libretroshare/src/file_sharing/rsfilelistitems.cc
+++ b/libretroshare/src/file_sharing/rsfilelistitems.cc
@@ -24,7 +24,7 @@
  */
 #include "serialiser/rsbaseserial.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #include "file_sharing/rsfilelistitems.h"
 
diff --git a/libretroshare/src/file_sharing/rsfilelistitems.h b/libretroshare/src/file_sharing/rsfilelistitems.h
index 8e45ef251..51e40b9c3 100644
--- a/libretroshare/src/file_sharing/rsfilelistitems.h
+++ b/libretroshare/src/file_sharing/rsfilelistitems.h
@@ -35,7 +35,7 @@
 #include "serialiser/rstlvkeys.h"
 #include "gxs/rsgxsdata.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 // These items have "flag type" numbers, but this is not used.
 
diff --git a/libretroshare/src/ft/ftturtlefiletransferitem.cc b/libretroshare/src/ft/ftturtlefiletransferitem.cc
index 3009fb87c..44722af4b 100644
--- a/libretroshare/src/ft/ftturtlefiletransferitem.cc
+++ b/libretroshare/src/ft/ftturtlefiletransferitem.cc
@@ -30,7 +30,7 @@
 #include <rsitems/itempriorities.h>
 #include <ft/ftturtlefiletransferitem.h>
 
-#include <serialization/rstypeserializer.h>
+#include <serialiser/rstypeserializer.h>
 
 void RsTurtleFileMapRequestItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
 {
diff --git a/libretroshare/src/grouter/grouteritems.cc b/libretroshare/src/grouter/grouteritems.cc
index 48da81548..c856132db 100644
--- a/libretroshare/src/grouter/grouteritems.cc
+++ b/libretroshare/src/grouter/grouteritems.cc
@@ -3,7 +3,7 @@
 #include "serialiser/rstlvbase.h"
 #include "grouteritems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /**********************************************************************************************/
 /*                                          SERIALISER STUFF                                  */
diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc
index 5f14fe079..bb56e93cc 100644
--- a/libretroshare/src/gxstunnel/rsgxstunnelitems.cc
+++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.cc
@@ -28,7 +28,7 @@
 #include <time.h>
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 #include "util/rsprint.h"
 #include "util/rsmemory.h"
 
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 2c503532a..f8ea1f6a7 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -770,11 +770,11 @@ SOURCES += gxstunnel/p3gxstunnel.cc \
 				gxstunnel/rsgxstunnelitems.cc 
 
 # new serialization code
-HEADERS += serialization/rsserializer.h \
-           serialization/rstypeserializer.h
+HEADERS += serialiser/rsserializer.h \
+           serialiser/rstypeserializer.h
 
-SOURCES += serialization/rsserializer.cc \
-           serialization/rstypeserializer.cc 
+SOURCES += serialiser/rsserializer.cc \
+           serialiser/rstypeserializer.cc 
 
 # Identity Service
 HEADERS += retroshare/rsidentity.h \
diff --git a/libretroshare/src/rsitems/rsbanlistitems.cc b/libretroshare/src/rsitems/rsbanlistitems.cc
index 85acfb96c..358d20961 100644
--- a/libretroshare/src/rsitems/rsbanlistitems.cc
+++ b/libretroshare/src/rsitems/rsbanlistitems.cc
@@ -26,7 +26,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "rsitems/rsbanlistitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rsbanlistitems.h b/libretroshare/src/rsitems/rsbanlistitems.h
index 836fe1b7e..e5660e55c 100644
--- a/libretroshare/src/rsitems/rsbanlistitems.h
+++ b/libretroshare/src/rsitems/rsbanlistitems.h
@@ -32,7 +32,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/itempriorities.h"
 #include "serialiser/rstlvbanlist.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 #define RS_PKT_SUBTYPE_BANLIST_ITEM_deprecated  		0x01
 #define RS_PKT_SUBTYPE_BANLIST_CONFIG_ITEM_deprecated 	0x02
diff --git a/libretroshare/src/rsitems/rsbwctrlitems.h b/libretroshare/src/rsitems/rsbwctrlitems.h
index 570e0d87b..71ec641e1 100644
--- a/libretroshare/src/rsitems/rsbwctrlitems.h
+++ b/libretroshare/src/rsitems/rsbwctrlitems.h
@@ -32,8 +32,8 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/itempriorities.h"
 
-#include "serialization/rsserializer.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rsserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #define RS_PKT_SUBTYPE_BWCTRL_ALLOWED_ITEM       0x01
 
diff --git a/libretroshare/src/rsitems/rsconfigitems.cc b/libretroshare/src/rsitems/rsconfigitems.cc
index 743e35871..15a8dd624 100644
--- a/libretroshare/src/rsitems/rsconfigitems.cc
+++ b/libretroshare/src/rsitems/rsconfigitems.cc
@@ -28,7 +28,7 @@
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rspeers.h" // Needed for RsGroupInfo.
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 /***
  * #define RSSERIAL_DEBUG 		1
  * #define RSSERIAL_ERROR_DEBUG 	1
diff --git a/libretroshare/src/rsitems/rsconfigitems.h b/libretroshare/src/rsitems/rsconfigitems.h
index bc4b9e824..d4ea41898 100644
--- a/libretroshare/src/rsitems/rsconfigitems.h
+++ b/libretroshare/src/rsitems/rsconfigitems.h
@@ -39,7 +39,7 @@
 #include "serialiser/rstlvkeyvalue.h"
 #include "serialiser/rstlvaddrs.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 class RsGroupInfo;
 
diff --git a/libretroshare/src/rsitems/rsdiscovery2items.cc b/libretroshare/src/rsitems/rsdiscovery2items.cc
index f9f19270c..0d1d3a493 100644
--- a/libretroshare/src/rsitems/rsdiscovery2items.cc
+++ b/libretroshare/src/rsitems/rsdiscovery2items.cc
@@ -27,7 +27,7 @@
 #include "rsitems/rsdiscovery2items.h"
 #include "serialiser/rsbaseserial.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #if 0
 
diff --git a/libretroshare/src/rsitems/rsdiscovery2items.h b/libretroshare/src/rsitems/rsdiscovery2items.h
index ce30a2928..012ebe1b5 100644
--- a/libretroshare/src/rsitems/rsdiscovery2items.h
+++ b/libretroshare/src/rsitems/rsdiscovery2items.h
@@ -35,7 +35,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/itempriorities.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 const uint8_t RS_PKT_SUBTYPE_DISC_PGP_LIST           = 0x01;
 const uint8_t RS_PKT_SUBTYPE_DISC_PGP_CERT           = 0x02;
diff --git a/libretroshare/src/rsitems/rsfiletransferitems.cc b/libretroshare/src/rsitems/rsfiletransferitems.cc
index cd0ea088d..7579c9560 100644
--- a/libretroshare/src/rsitems/rsfiletransferitems.cc
+++ b/libretroshare/src/rsitems/rsfiletransferitems.cc
@@ -28,7 +28,7 @@
 #include "serialiser/rstlvbase.h"
 #include "rsitems/rsfiletransferitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
  * #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rsfiletransferitems.h b/libretroshare/src/rsitems/rsfiletransferitems.h
index b0ab0972a..85f6d5eab 100644
--- a/libretroshare/src/rsitems/rsfiletransferitems.h
+++ b/libretroshare/src/rsitems/rsfiletransferitems.h
@@ -34,7 +34,7 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/itempriorities.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 const uint8_t RS_PKT_SUBTYPE_FT_DATA_REQUEST       = 0x01;
 const uint8_t RS_PKT_SUBTYPE_FT_DATA               = 0x02;
diff --git a/libretroshare/src/rsitems/rsgxschannelitems.cc b/libretroshare/src/rsitems/rsgxschannelitems.cc
index 789357b4c..a8cc067b1 100644
--- a/libretroshare/src/rsitems/rsgxschannelitems.cc
+++ b/libretroshare/src/rsitems/rsgxschannelitems.cc
@@ -29,7 +29,7 @@
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 RsItem *RsGxsChannelSerialiser::create_item(uint16_t service_id,uint8_t item_subtype) const
 {
diff --git a/libretroshare/src/rsitems/rsgxschannelitems.h b/libretroshare/src/rsitems/rsgxschannelitems.h
index b4caf5197..b0fc67987 100644
--- a/libretroshare/src/rsitems/rsgxschannelitems.h
+++ b/libretroshare/src/rsitems/rsgxschannelitems.h
@@ -37,7 +37,7 @@
 
 #include "retroshare/rsgxschannels.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 #include "util/rsdir.h"
 
diff --git a/libretroshare/src/rsitems/rsgxscircleitems.cc b/libretroshare/src/rsitems/rsgxscircleitems.cc
index a5937b5ab..40ae6cf5f 100644
--- a/libretroshare/src/rsitems/rsgxscircleitems.cc
+++ b/libretroshare/src/rsitems/rsgxscircleitems.cc
@@ -27,7 +27,7 @@
 
 #include "rsgxscircleitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 //#define CIRCLE_DEBUG	1
 
diff --git a/libretroshare/src/rsitems/rsgxscommentitems.cc b/libretroshare/src/rsitems/rsgxscommentitems.cc
index 4f655cc13..407f64204 100644
--- a/libretroshare/src/rsitems/rsgxscommentitems.cc
+++ b/libretroshare/src/rsitems/rsgxscommentitems.cc
@@ -28,7 +28,7 @@
 #include "rsgxscommentitems.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 //#define GXSCOMMENT_DEBUG	1
 
diff --git a/libretroshare/src/rsitems/rsgxsforumitems.cc b/libretroshare/src/rsitems/rsgxsforumitems.cc
index 462f4fcf6..fb5b8f632 100644
--- a/libretroshare/src/rsitems/rsgxsforumitems.cc
+++ b/libretroshare/src/rsitems/rsgxsforumitems.cc
@@ -27,7 +27,7 @@
 
 #include "rsgxsforumitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 //#define GXSFORUM_DEBUG	1
 
diff --git a/libretroshare/src/rsitems/rsgxsforumitems.h b/libretroshare/src/rsitems/rsgxsforumitems.h
index 8e8d2bc24..5ce8a84ee 100644
--- a/libretroshare/src/rsitems/rsgxsforumitems.h
+++ b/libretroshare/src/rsitems/rsgxsforumitems.h
@@ -31,7 +31,7 @@
 #include "rsitems/rsserviceids.h"
 #include "rsitems/rsgxsitems.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 #include "retroshare/rsgxsforums.h"
 
diff --git a/libretroshare/src/rsitems/rsgxsiditems.cc b/libretroshare/src/rsitems/rsgxsiditems.cc
index cb5ed324e..5bf55b549 100644
--- a/libretroshare/src/rsitems/rsgxsiditems.cc
+++ b/libretroshare/src/rsitems/rsgxsiditems.cc
@@ -31,7 +31,7 @@
 #include "serialiser/rstlvstring.h"
 #include "util/rsstring.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #define GXSID_DEBUG	1
 
diff --git a/libretroshare/src/rsitems/rsgxsrecognitems.cc b/libretroshare/src/rsitems/rsgxsrecognitems.cc
index 100ede2ba..81b8d866b 100644
--- a/libretroshare/src/rsitems/rsgxsrecognitems.cc
+++ b/libretroshare/src/rsitems/rsgxsrecognitems.cc
@@ -24,7 +24,7 @@
  */
 
 #include "rsitems/rsgxsrecognitems.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rsgxsreputationitems.cc b/libretroshare/src/rsitems/rsgxsreputationitems.cc
index 1a50bf9dc..2a559b052 100644
--- a/libretroshare/src/rsitems/rsgxsreputationitems.cc
+++ b/libretroshare/src/rsitems/rsgxsreputationitems.cc
@@ -28,7 +28,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "rsitems/rsgxsreputationitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rsgxsreputationitems.h b/libretroshare/src/rsitems/rsgxsreputationitems.h
index 7c841bd4e..d4134f745 100644
--- a/libretroshare/src/rsitems/rsgxsreputationitems.h
+++ b/libretroshare/src/rsitems/rsgxsreputationitems.h
@@ -37,7 +37,7 @@
 #include "retroshare/rsgxsifacetypes.h"
 #include "retroshare/rsreputations.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 #define RS_PKT_SUBTYPE_GXS_REPUTATION_CONFIG_ITEM          0x01
 #define RS_PKT_SUBTYPE_GXS_REPUTATION_SET_ITEM_deprecated2 0x02
diff --git a/libretroshare/src/rsitems/rsgxsupdateitems.cc b/libretroshare/src/rsitems/rsgxsupdateitems.cc
index 259cd1b4a..50f154cb2 100644
--- a/libretroshare/src/rsitems/rsgxsupdateitems.cc
+++ b/libretroshare/src/rsitems/rsgxsupdateitems.cc
@@ -23,7 +23,7 @@
  *
  */
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 #include "serialiser/rsbaseserial.h"
 
 #include "rsgxsupdateitems.h"
diff --git a/libretroshare/src/rsitems/rshistoryitems.cc b/libretroshare/src/rsitems/rshistoryitems.cc
index 38f2f0254..3280f8eba 100644
--- a/libretroshare/src/rsitems/rshistoryitems.cc
+++ b/libretroshare/src/rsitems/rshistoryitems.cc
@@ -29,7 +29,7 @@
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rshistoryitems.h b/libretroshare/src/rsitems/rshistoryitems.h
index 56d12e559..04d3e9ca7 100644
--- a/libretroshare/src/rsitems/rshistoryitems.h
+++ b/libretroshare/src/rsitems/rshistoryitems.h
@@ -31,7 +31,7 @@
 #include "rsitems/rsconfigitems.h"
 #include "retroshare/rstypes.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 /**************************************************************************/
 
diff --git a/libretroshare/src/rsitems/rsitem.h b/libretroshare/src/rsitems/rsitem.h
index f7f6dae54..8dbda2fb3 100644
--- a/libretroshare/src/rsitems/rsitem.h
+++ b/libretroshare/src/rsitems/rsitem.h
@@ -2,7 +2,7 @@
 
 #include "util/smallobject.h"
 #include "retroshare/rstypes.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 class RsItem: public RsMemoryManagement::SmallObject
 {
diff --git a/libretroshare/src/rsitems/rsmsgitems.cc b/libretroshare/src/rsitems/rsmsgitems.cc
index 20c98ad1b..09f305fc7 100644
--- a/libretroshare/src/rsitems/rsmsgitems.cc
+++ b/libretroshare/src/rsitems/rsmsgitems.cc
@@ -31,7 +31,7 @@
 
 #include "rsitems/rsmsgitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/rsitems/rsnxsitems.cc b/libretroshare/src/rsitems/rsnxsitems.cc
index bfea43843..d6eb8b143 100644
--- a/libretroshare/src/rsitems/rsnxsitems.cc
+++ b/libretroshare/src/rsitems/rsnxsitems.cc
@@ -2,7 +2,7 @@
 #include "util/rsprint.h"
 #include <iomanip>
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /***
  * #define RSSERIAL_DEBUG	1
diff --git a/libretroshare/src/rsitems/rsphotoitems.cc b/libretroshare/src/rsitems/rsphotoitems.cc
index 9c2f217d9..9c9ff2d02 100644
--- a/libretroshare/src/rsitems/rsphotoitems.cc
+++ b/libretroshare/src/rsitems/rsphotoitems.cc
@@ -28,7 +28,7 @@
 #include "rsitems/rsphotoitems.h"
 
 #include "serialiser/rstlvbinary.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #define GXS_PHOTO_SERIAL_DEBUG
 
diff --git a/libretroshare/src/rsitems/rsphotoitems.h b/libretroshare/src/rsitems/rsphotoitems.h
index cbaf29700..3819edb88 100644
--- a/libretroshare/src/rsitems/rsphotoitems.h
+++ b/libretroshare/src/rsitems/rsphotoitems.h
@@ -32,7 +32,7 @@
 #include "rsitems/rsgxsitems.h"
 
 #include "serialiser/rsserial.h"
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 #include "retroshare/rsphoto.h"
 
diff --git a/libretroshare/src/rsitems/rspluginitems.h b/libretroshare/src/rsitems/rspluginitems.h
index d21533c68..f5ff61321 100644
--- a/libretroshare/src/rsitems/rspluginitems.h
+++ b/libretroshare/src/rsitems/rspluginitems.h
@@ -29,7 +29,7 @@
 #include "rsitems/rsitem.h"
 #include "rsitems/rsconfigitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 const uint8_t RS_PKT_CLASS_PLUGIN_SUBTYPE_HASHSET = 0x01 ;
 
diff --git a/libretroshare/src/rsitems/rsposteditems.cc b/libretroshare/src/rsitems/rsposteditems.cc
index 652abed05..378153df3 100644
--- a/libretroshare/src/rsitems/rsposteditems.cc
+++ b/libretroshare/src/rsitems/rsposteditems.cc
@@ -25,7 +25,7 @@
  */
 
 #include "rsitems/rsposteditems.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 void RsGxsPostedPostItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
 {
diff --git a/libretroshare/src/rsitems/rsrttitems.cc b/libretroshare/src/rsitems/rsrttitems.cc
index 2ab7292e5..c4c499f79 100644
--- a/libretroshare/src/rsitems/rsrttitems.cc
+++ b/libretroshare/src/rsitems/rsrttitems.cc
@@ -32,7 +32,7 @@
 
 #include <iostream>
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /*************************************************************************/
 
diff --git a/libretroshare/src/rsitems/rsrttitems.h b/libretroshare/src/rsitems/rsrttitems.h
index 8f635c3b9..35cf85bae 100644
--- a/libretroshare/src/rsitems/rsrttitems.h
+++ b/libretroshare/src/rsitems/rsrttitems.h
@@ -33,7 +33,7 @@
 #include "rsitems/itempriorities.h"
 #include "serialiser/rsserial.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 /**************************************************************************/
 
diff --git a/libretroshare/src/rsitems/rsserviceinfoitems.cc b/libretroshare/src/rsitems/rsserviceinfoitems.cc
index 35ba6d02d..d0d2070ab 100644
--- a/libretroshare/src/rsitems/rsserviceinfoitems.cc
+++ b/libretroshare/src/rsitems/rsserviceinfoitems.cc
@@ -24,7 +24,7 @@
  */
 
 #include "serialiser/rsbaseserial.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 #include "rsitems/rsserviceinfoitems.h"
 
 /***
diff --git a/libretroshare/src/rsitems/rsstatusitems.h b/libretroshare/src/rsitems/rsstatusitems.h
index 8c0316a9b..8a8a946b7 100644
--- a/libretroshare/src/rsitems/rsstatusitems.h
+++ b/libretroshare/src/rsitems/rsstatusitems.h
@@ -30,7 +30,7 @@
 #include "rsitems/itempriorities.h"
 #include "rsitems/rsitem.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 /**************************************************************************/
 
diff --git a/libretroshare/src/rsitems/rswikiitems.cc b/libretroshare/src/rsitems/rswikiitems.cc
index 8da92ab58..ec42e14f0 100644
--- a/libretroshare/src/rsitems/rswikiitems.cc
+++ b/libretroshare/src/rsitems/rswikiitems.cc
@@ -27,7 +27,7 @@
 
 #include "rsitems/rswikiitems.h"
 #include "serialiser/rstlvbase.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #define GXSID_DEBUG	1
 
diff --git a/libretroshare/src/rsitems/rswireitems.cc b/libretroshare/src/rsitems/rswireitems.cc
index 988189b60..55a56a803 100644
--- a/libretroshare/src/rsitems/rswireitems.cc
+++ b/libretroshare/src/rsitems/rswireitems.cc
@@ -27,7 +27,7 @@
 
 #include "rswireitems.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 #define WIRE_DEBUG	1
 
diff --git a/libretroshare/src/serialization/rsserializer.cc b/libretroshare/src/serialiser/rsserializer.cc
similarity index 98%
rename from libretroshare/src/serialization/rsserializer.cc
rename to libretroshare/src/serialiser/rsserializer.cc
index f9619e839..bc1c9f92a 100644
--- a/libretroshare/src/serialization/rsserializer.cc
+++ b/libretroshare/src/serialiser/rsserializer.cc
@@ -3,8 +3,8 @@
 #include "rsitems/rsitem.h"
 
 #include "util/rsprint.h"
-#include "serialization/rsserializer.h"
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rsserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 const SerializationFlags RsGenericSerializer::SERIALIZATION_FLAG_NONE        ( 0x0000 );
 const SerializationFlags RsGenericSerializer::SERIALIZATION_FLAG_CONFIG      ( 0x0001 );
diff --git a/libretroshare/src/serialization/rsserializer.h b/libretroshare/src/serialiser/rsserializer.h
similarity index 100%
rename from libretroshare/src/serialization/rsserializer.h
rename to libretroshare/src/serialiser/rsserializer.h
diff --git a/libretroshare/src/serialization/rstypeserializer.cc b/libretroshare/src/serialiser/rstypeserializer.cc
similarity index 100%
rename from libretroshare/src/serialization/rstypeserializer.cc
rename to libretroshare/src/serialiser/rstypeserializer.cc
diff --git a/libretroshare/src/serialization/rstypeserializer.h b/libretroshare/src/serialiser/rstypeserializer.h
similarity index 99%
rename from libretroshare/src/serialization/rstypeserializer.h
rename to libretroshare/src/serialiser/rstypeserializer.h
index a999a24d0..6ad237be9 100644
--- a/libretroshare/src/serialization/rstypeserializer.h
+++ b/libretroshare/src/serialiser/rstypeserializer.h
@@ -7,7 +7,7 @@
 #include "retroshare/rsflags.h"
 #include "retroshare/rsids.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 
 class RsTypeSerializer
diff --git a/libretroshare/src/serialization/serial_test.cc b/libretroshare/src/serialization/serial_test.cc
deleted file mode 100644
index a8d89a25f..000000000
--- a/libretroshare/src/serialization/serial_test.cc
+++ /dev/null
@@ -1,196 +0,0 @@
-// COMPILE_LINE: g++ -g serial_test.cc -I.. -o serial_test ../lib/libretroshare.a -lssl -lcrypto -lstdc++ -lpthread
-//
-//
-
-#include <set>
-#include <vector>
-
-#include "util/rsmemory.h"
-#include "util/rsprint.h"
-#include "serialiser/rsserial.h"
-
-#include "rsserializer.h"
-#include "rstypeserializer.h"
-
-#define GET_VARIABLE_NAME(str) #str
-
-static const uint16_t RS_SERVICE_TYPE_TEST  = 0xffff;
-static const uint8_t  RS_ITEM_SUBTYPE_TEST1 = 0x01 ;
-
-// Template serialization of RsTypeSerialiser::serial_process() for unknown/new types
-// Here we do it for std::set<uint32_t> as an example.
-//
-template<> uint32_t RsTypeSerializer::serial_size(const std::set<uint32_t>& s)
-{
-	return s.size() * 4 + 4 ;
-}
-template<> bool RsTypeSerializer::serialize(uint8_t data[], uint32_t size, uint32_t &offset, const std::set<uint32_t>& member)
-{
-	uint32_t tlvsize = serial_size(member) ;
-	bool ok = true ;
-	uint32_t offset_save = offset ;
-
-	if(tlvsize + offset > size)
-	{
-		std::cerr << "RsTypeSerializer::serialize: error. tlvsize+offset > size, where tlvsize=" << tlvsize << ", offset=" << offset << ", size=" << size << std::endl;
-		return false ;
-	}
-
-	ok = ok && RsTypeSerializer::serialize<uint32_t>(data,size,offset,member.size()) ;
-
-	for(std::set<uint32_t>::const_iterator it(member.begin());it!=member.end();++it)
-		ok = ok && RsTypeSerializer::serialize<uint32_t>(data,size,offset,*it) ;
-
-	if(!ok)
-	{
-		std::cerr << "(EE) Cannot serialize std::set<uint32_t>" << std::endl;
-		offset = offset_save ;	// return the data in the same condition
-	}
-	return ok ;
-}
-
-template<> bool RsTypeSerializer::deserialize(const uint8_t data[], uint32_t size, uint32_t &offset, std::set<uint32_t>& member)
-{
-	bool ok = true ;
-	uint32_t n = 0 ;
-	uint32_t offset_save = offset ;
-	member.clear();
-
-	ok = ok && RsTypeSerializer::deserialize(data,size,offset,n);
-
-	for(uint32_t i=0;i<n && ok;++i)
-	{
-		uint32_t x;
-		ok = ok && RsTypeSerializer::deserialize(data,size,offset,x) ;
-
-		member.insert(x);
-	}
-
-	if(!ok)
-	{
-		std::cerr << "(EE) Cannot deserialize std::set<uint32_t>" << std::endl;
-		offset = offset_save ;	// return the data in the same condition
-	}
-	return ok;
-}
-
-template<> void RsTypeSerializer::print_data(const std::string& s,const std::set<uint32_t>& set)
-{
-	std::cerr << "  [set<uint32_t>] " << s << " : set of size " << set.size() << std::endl;
-}
-
-// New item class. This class needs to define:
-// - a serial_process method that tells which members to serialize
-// - overload the clear() and print() methods of RsItem
-//
-class RsTestItem: public RsItem
-{
-	public:
-		RsTestItem() : RsItem(RS_PKT_VERSION_SERVICE,RS_SERVICE_TYPE_TEST,RS_ITEM_SUBTYPE_TEST1) 
-		{
-			str = "test string";
-			ts = time(NULL) ;
-
-			int_set.push_back(lrand48()) ;
-			int_set.push_back(lrand48()) ;
-			int_set.push_back(lrand48()) ;
-		}
-
-		// Derived from RsItem
-		//
-		virtual void serial_process(RsItem::SerializeJob j, SerializeContext& ctx) 
-		{
-			RsTypeSerializer::TlvString_proxy tt(str,TLV_TYPE_STR_DESCR) ;
-
-			RsTypeSerializer::serial_process(j,ctx,ts     ,GET_VARIABLE_NAME(ts)      ) ;
-			RsTypeSerializer::serial_process(j,ctx,tt     ,GET_VARIABLE_NAME(str)     ) ;
-			RsTypeSerializer::serial_process(j,ctx,int_set,GET_VARIABLE_NAME(int_set) ) ;
-		}
-
-		// Derived from RsItem, because they are pure virtuals. Normally print() should disappear soon.
-		//
-		virtual void clear() {}
-		virtual std::ostream& print(std::ostream&,uint16_t) {}
-
-	private:
-		std::string str ;
-		uint64_t ts ;
-		std::vector<uint32_t> int_set ;
-
-		friend int main(int argc,char *argv[]);
-};
-
-// New user-defined serializer class. 
-// The only required member is the create_item() method, which creates the correct RsItem 
-// that corresponds to a specific (service,subtype) couple.
-//
-class RsTestSerializer: public RsSerializer
-{
-	public:
-		RsTestSerializer() : RsSerializer(RS_SERVICE_TYPE_TEST) {}
-
-		virtual RsItem *create_item(uint16_t service_id,uint8_t subtype)
-		{
-			if(service_id != RS_SERVICE_TYPE_TEST)
-				return NULL ;
-
-			switch(subtype)
-			{
-				case RS_ITEM_SUBTYPE_TEST1: return new RsTestItem();
-
-				default:
-					return NULL ;
-			}
-		}
-};
-
-// Methods to check the equality of items.
-//
-void check(const std::string& s1,const std::string& s2) { assert(s1 == s2) ; }
-void check(const uint64_t& s1,const uint64_t& s2) { assert(s1 == s2) ; }
-void check(const std::set<uint32_t>& s1,const std::set<uint32_t>& s2) { assert(s1 == s2) ; }
-void check(const std::vector<uint32_t>& s1,const std::vector<uint32_t>& s2) { assert(s1 == s2) ; }
-
-int main(int argc,char *argv[])
-{
-	try
-	{
-		RsTestItem t1 ;
-
-		uint32_t size = RsTestSerializer().size(&t1);
-
-		std::cerr << "t1.serial_size() = " << size << std::endl;
-
-		// Allocate some memory to serialise to
-		//
-		RsTemporaryMemory mem1(size);
-
-		std::cerr << "Item to be serialized:" << std::endl;
-
-		RsTestSerializer().print(&t1) ;
-		RsTestSerializer().serialise(&t1,mem1,&size);
-
-		std::cerr << "Serialized t1: " << RsUtil::BinToHex(mem1,mem1.size()) << std::endl;
-
-		// Now deserialise into a new item
-		//
-		RsItem *t2 = RsTestSerializer().deserialise(mem1,&size);
-
-		// make sure t1 is equal to t2
-		//
-		check(t1.str,dynamic_cast<RsTestItem*>(t2)->str) ;
-		check(t1.ts,dynamic_cast<RsTestItem*>(t2)->ts) ;
-		check(t1.int_set,dynamic_cast<RsTestItem*>(t2)->int_set) ;
-
-		delete t2;
-
-		return 0;
-	}
-	catch(std::exception& e)
-	{
-		std::cerr << "Exception caught: " << e.what() << std::endl;
-		return 1;
-	}
-}
-
-
diff --git a/libretroshare/src/turtle/rsturtleitem.cc b/libretroshare/src/turtle/rsturtleitem.cc
index 2455c98e5..35b250117 100644
--- a/libretroshare/src/turtle/rsturtleitem.cc
+++ b/libretroshare/src/turtle/rsturtleitem.cc
@@ -6,7 +6,7 @@
 #include "rsturtleitem.h"
 #include "turtleclientservice.h"
 
-#include "serialization/rstypeserializer.h"
+#include "serialiser/rstypeserializer.h"
 
 //#define P3TURTLE_DEBUG
 // -----------------------------------------------------------------------------------//
diff --git a/libretroshare/src/turtle/rsturtleitem.h b/libretroshare/src/turtle/rsturtleitem.h
index 8a8a1e49c..78f6155d8 100644
--- a/libretroshare/src/turtle/rsturtleitem.h
+++ b/libretroshare/src/turtle/rsturtleitem.h
@@ -13,7 +13,7 @@
 #include "retroshare/rstypes.h"
 #include "turtle/turtletypes.h"
 
-#include "serialization/rsserializer.h"
+#include "serialiser/rsserializer.h"
 
 const uint8_t RS_TURTLE_SUBTYPE_STRING_SEARCH_REQUEST	= 0x01 ;
 const uint8_t RS_TURTLE_SUBTYPE_SEARCH_RESULT  			= 0x02 ;