diff --git a/libretroshare/src/gxs/gxssecurity.h b/libretroshare/src/gxs/gxssecurity.h
index b19f81302..047094688 100644
--- a/libretroshare/src/gxs/gxssecurity.h
+++ b/libretroshare/src/gxs/gxssecurity.h
@@ -28,7 +28,8 @@
  */
 
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsnxsitems.h"
+
+#include "rsitems/rsnxsitems.h"
 
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
diff --git a/libretroshare/src/gxs/rsgds.h b/libretroshare/src/gxs/rsgds.h
index 5a82337fe..303d411b8 100644
--- a/libretroshare/src/gxs/rsgds.h
+++ b/libretroshare/src/gxs/rsgds.h
@@ -33,7 +33,7 @@
 #include "inttypes.h"
 
 #include "rsitems/rsgxsitems.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "gxs/rsgxsdata.h"
 #include "rsgxs.h"
 #include "util/contentvalue.h"
diff --git a/libretroshare/src/gxs/rsgenexchange.h b/libretroshare/src/gxs/rsgenexchange.h
index 21ea4365c..8ebd40bd7 100644
--- a/libretroshare/src/gxs/rsgenexchange.h
+++ b/libretroshare/src/gxs/rsgenexchange.h
@@ -36,7 +36,7 @@
 #include "rsgxsdataaccess.h"
 #include "rsnxsobserver.h"
 #include "retroshare/rsgxsservice.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "rsgxsutil.h"
 
 template<class GxsItem, typename Identity = std::string>
diff --git a/libretroshare/src/gxs/rsgxsnetservice.h b/libretroshare/src/gxs/rsgxsnetservice.h
index b14d55058..883649e57 100644
--- a/libretroshare/src/gxs/rsgxsnetservice.h
+++ b/libretroshare/src/gxs/rsgxsnetservice.h
@@ -33,7 +33,7 @@
 #include "rsgds.h"
 #include "rsnxsobserver.h"
 #include "pqi/p3linkmgr.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "serialiser/rsgxsupdateitems.h"
 #include "rsgxsnetutils.h"
 #include "pqi/p3cfgmgr.h"
diff --git a/libretroshare/src/gxs/rsgxsnetutils.h b/libretroshare/src/gxs/rsgxsnetutils.h
index df82cb2b3..aae2be9f8 100644
--- a/libretroshare/src/gxs/rsgxsnetutils.h
+++ b/libretroshare/src/gxs/rsgxsnetutils.h
@@ -28,7 +28,7 @@
 
 #include <stdlib.h>
 #include "retroshare/rsgxsifacetypes.h"
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "rsgixs.h"
 
 class p3ServiceControl;
diff --git a/libretroshare/src/gxs/rsgxsutil.h b/libretroshare/src/gxs/rsgxsutil.h
index a47b981d3..ea94fedcb 100644
--- a/libretroshare/src/gxs/rsgxsutil.h
+++ b/libretroshare/src/gxs/rsgxsutil.h
@@ -27,7 +27,7 @@
 #define GXSUTIL_H_
 
 #include <vector>
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 #include "rsgds.h"
 
 class RsGixs ;
diff --git a/libretroshare/src/gxs/rsnxsobserver.h b/libretroshare/src/gxs/rsnxsobserver.h
index 2b25fc950..087842ef0 100644
--- a/libretroshare/src/gxs/rsnxsobserver.h
+++ b/libretroshare/src/gxs/rsnxsobserver.h
@@ -27,7 +27,7 @@
  */
 
 #include <set>
-#include "serialiser/rsnxsitems.h"
+#include "rsitems/rsnxsitems.h"
 
 
 class RsNxsObserver
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 4d2e75c7c..1c047a75b 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -722,7 +722,7 @@ SOURCES +=	zeroconf/p3zcnatassist.cc \
 DEFINES *= SQLITE_HAS_CODEC
 DEFINES *= GXS_ENABLE_SYNC_MSGS
 
-HEADERS += serialiser/rsnxsitems.h \
+HEADERS += rsitems/rsnxsitems.h \
 	gxs/rsgds.h \
 	gxs/rsgxs.h \
 	gxs/rsdataservice.h \
@@ -748,7 +748,7 @@ HEADERS += serialiser/rsnxsitems.h \
 	gxs/rsgxsrequesttypes.h
 
 
-SOURCES += serialiser/rsnxsitems.cc \
+SOURCES += rsitems/rsnxsitems.cc \
 	gxs/rsdataservice.cc \
 	gxs/rsgenexchange.cc \
 	gxs/rsgxsnetservice.cc \
diff --git a/libretroshare/src/serialiser/rsnxsitems.cc b/libretroshare/src/rsitems/rsnxsitems.cc
similarity index 100%
rename from libretroshare/src/serialiser/rsnxsitems.cc
rename to libretroshare/src/rsitems/rsnxsitems.cc
diff --git a/libretroshare/src/serialiser/rsnxsitems.h b/libretroshare/src/rsitems/rsnxsitems.h
similarity index 100%
rename from libretroshare/src/serialiser/rsnxsitems.h
rename to libretroshare/src/rsitems/rsnxsitems.h