From e2d9152b226bc003d9c1d64d54ea7e9e96609f10 Mon Sep 17 00:00:00 2001
From: csoler <csoler@users.sourceforge.net>
Date: Tue, 18 Apr 2017 21:11:37 +0200
Subject: [PATCH] moved converted serialisation files into new directory
 rsitems/, leaving serialiser/ for the serialisation classes

---
 libretroshare/src/chat/rschatitems.h          |   2 +-
 libretroshare/src/file_sharing/p3filelists.cc |   2 +-
 .../src/file_sharing/rsfilelistitems.h        |   2 +-
 libretroshare/src/ft/ftserver.cc              |   4 +-
 .../src/ft/ftturtlefiletransferitem.cc        | 542 +-----------------
 libretroshare/src/grouter/grouteritems.h      |   2 +-
 .../src/gxstunnel/rsgxstunnelitems.h          |   2 +-
 libretroshare/src/libretroshare.pro           |  16 +-
 libretroshare/src/pqi/p3servicecontrol.cc     |   2 +-
 .../{serialiser => rsitems}/itempriorities.h  |   0
 .../{serialiser => rsitems}/rsbanlistitems.cc |   2 +-
 .../{serialiser => rsitems}/rsbanlistitems.h  |   2 +-
 .../{serialiser => rsitems}/rsbwctrlitems.cc  |   2 +-
 .../{serialiser => rsitems}/rsbwctrlitems.h   |   2 +-
 .../rsfiletransferitems.cc                    |   2 +-
 .../rsfiletransferitems.h                     |   2 +-
 .../{serialiser => rsitems}/rsserviceids.h    |   0
 .../src/serialiser/rsdiscovery2items.cc       |   2 +-
 .../src/serialiser/rsdiscovery2items.h        |   2 +-
 libretroshare/src/serialiser/rsdsdvitems.h    |   2 +-
 .../src/serialiser/rsgxschannelitems.h        |   2 +-
 .../src/serialiser/rsgxscircleitems.h         |   2 +-
 .../src/serialiser/rsgxscommentitems.h        |   2 +-
 .../src/serialiser/rsgxsforumitems.h          |   2 +-
 libretroshare/src/serialiser/rsgxsiditems.h   |   2 +-
 libretroshare/src/serialiser/rsgxsitems.h     |   2 +-
 .../src/serialiser/rsgxsrecognitems.h         |   2 +-
 .../src/serialiser/rsgxsreputationitems.h     |   2 +-
 .../src/serialiser/rsgxsupdateitems.h         |   2 +-
 .../src/serialiser/rsheartbeatitems.cc        |   2 +-
 .../src/serialiser/rsheartbeatitems.h         |   2 +-
 libretroshare/src/serialiser/rshistoryitems.h |   2 +-
 libretroshare/src/serialiser/rsmsgitems.h     |   2 +-
 libretroshare/src/serialiser/rsnxsitems.h     |   2 +-
 libretroshare/src/serialiser/rsphotoitems.h   |   2 +-
 libretroshare/src/serialiser/rsposteditems.h  |   2 +-
 libretroshare/src/serialiser/rsrttitems.h     |   2 +-
 libretroshare/src/serialiser/rsserial.h       |   2 +-
 .../src/serialiser/rsserviceinfoitems.h       |   2 +-
 libretroshare/src/serialiser/rsstatusitems.h  |   2 +-
 libretroshare/src/serialiser/rswikiitems.h    |   2 +-
 libretroshare/src/serialiser/rswireitems.h    |   2 +-
 libretroshare/src/services/p3banlist.cc       |   2 +-
 libretroshare/src/services/p3banlist.h        |   2 +-
 libretroshare/src/services/p3bwctrl.cc        |   2 +-
 libretroshare/src/services/p3bwctrl.h         |   2 +-
 libretroshare/src/services/p3serviceinfo.cc   |   2 +-
 libretroshare/src/turtle/rsturtleitem.h       |   2 +-
 plugins/FeedReader/FeedReaderPlugin.h         |   2 +-
 .../FeedReader/services/rsFeedReaderItems.h   |   2 +-
 plugins/VOIP/services/rsVOIPItems.h           |   2 +-
 .../services/gxs/rsgxstestitems.h             |   2 +-
 52 files changed, 58 insertions(+), 598 deletions(-)
 rename libretroshare/src/{serialiser => rsitems}/itempriorities.h (100%)
 rename libretroshare/src/{serialiser => rsitems}/rsbanlistitems.cc (98%)
 rename libretroshare/src/{serialiser => rsitems}/rsbanlistitems.h (98%)
 rename libretroshare/src/{serialiser => rsitems}/rsbwctrlitems.cc (99%)
 rename libretroshare/src/{serialiser => rsitems}/rsbwctrlitems.h (98%)
 rename libretroshare/src/{serialiser => rsitems}/rsfiletransferitems.cc (99%)
 rename libretroshare/src/{serialiser => rsitems}/rsfiletransferitems.h (99%)
 rename libretroshare/src/{serialiser => rsitems}/rsserviceids.h (100%)

diff --git a/libretroshare/src/chat/rschatitems.h b/libretroshare/src/chat/rschatitems.h
index 7771a375f..456ffe5b6 100644
--- a/libretroshare/src/chat/rschatitems.h
+++ b/libretroshare/src/chat/rschatitems.h
@@ -29,7 +29,7 @@
 #include "retroshare/rstypes.h"
 #include "serialization/rsserializer.h"
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "serialiser/rstlvidset.h"
diff --git a/libretroshare/src/file_sharing/p3filelists.cc b/libretroshare/src/file_sharing/p3filelists.cc
index 2c30b6813..492c37f67 100644
--- a/libretroshare/src/file_sharing/p3filelists.cc
+++ b/libretroshare/src/file_sharing/p3filelists.cc
@@ -22,7 +22,7 @@
  * Please report all bugs and problems to "retroshare.project@gmail.com".
  *
  */
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 
 #include "file_sharing/p3filelists.h"
 #include "file_sharing/directory_storage.h"
diff --git a/libretroshare/src/file_sharing/rsfilelistitems.h b/libretroshare/src/file_sharing/rsfilelistitems.h
index 8c1d466e1..d56827527 100644
--- a/libretroshare/src/file_sharing/rsfilelistitems.h
+++ b/libretroshare/src/file_sharing/rsfilelistitems.h
@@ -27,7 +27,7 @@
 #include <map>
 #include <openssl/ssl.h>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvitem.h"
diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc
index 5b04f2828..9dcc139d4 100644
--- a/libretroshare/src/ft/ftserver.cc
+++ b/libretroshare/src/ft/ftserver.cc
@@ -49,8 +49,8 @@ const int ftserverzone = 29539;
 #include "pqi/pqi.h"
 #include "pqi/p3linkmgr.h"
 
-#include "serialiser/rsfiletransferitems.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsfiletransferitems.h"
+#include "rsitems/rsserviceids.h"
 
 /***
  * #define SERVER_DEBUG       1
diff --git a/libretroshare/src/ft/ftturtlefiletransferitem.cc b/libretroshare/src/ft/ftturtlefiletransferitem.cc
index 722991aef..5c343b7fa 100644
--- a/libretroshare/src/ft/ftturtlefiletransferitem.cc
+++ b/libretroshare/src/ft/ftturtlefiletransferitem.cc
@@ -27,557 +27,17 @@
 #include <stdexcept>
 
 #include <util/rsmemory.h>
-#include <serialiser/itempriorities.h>
+#include <rsitems/itempriorities.h>
 #include <ft/ftturtlefiletransferitem.h>
 
 #include <serialization/rstypeserializer.h>
 
-#ifdef TO_REMOVE
-uint32_t RsTurtleFileRequestItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 8 ; // file offset
-	s += 4 ; // chunk size
-
-	return s ;
-}
-
-uint32_t RsTurtleFileDataItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 8 ; // file offset
-	s += 4 ; // chunk size
-	s += chunk_size ;	// actual data size.
-
-	return s ;
-}
-
-uint32_t RsTurtleFileMapRequestItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 4 ; // direction
-
-	return s ;
-}
-
-uint32_t RsTurtleFileMapItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 4 ; // direction
-	s += 4 ; // compressed_map.size()
-
-	s += 4 * compressed_map._map.size() ;
-
-	return s ;
-}
-
-uint32_t RsTurtleChunkCrcItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 4 ; // chunk number
-	s += check_sum.serial_size() ; // check_sum 
-
-	return s ;
-}
-uint32_t RsTurtleChunkCrcRequestItem::serial_size() const
-{
-	uint32_t s = 0 ;
-
-	s += 8 ; // header
-	s += 4 ; // tunnel id 
-	s += 4 ; // chunk number
-
-	return s ;
-}
-#endif
-
 void RsTurtleFileMapRequestItem::serial_process(SerializeJob j,SerializeContext& ctx)
 {
     RsTypeSerializer::serial_process<uint32_t>(j,ctx,tunnel_id,"tunnel_id") ;
     RsTypeSerializer::serial_process<uint32_t>(j,ctx,direction,"direction") ;
 }
 
-#ifdef TO_REMOVE
-bool RsTurtleFileMapRequestItem::serialize(void *data,uint32_t& pktsize) const
-{
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id);
-	ok &= setRawUInt32(data, tlvsize, &offset, direction);
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-#ifdef RSSERIAL_DEBUG
-		std::cerr << "RsFileConfigSerialiser::serialiseTransfer() Size Error! " << std::endl;
-#endif
-	}
-
-	return ok;
-}
-
-
-bool RsTurtleFileMapItem::serialize(void *data,uint32_t& pktsize) const
-{
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id);
-	ok &= setRawUInt32(data, tlvsize, &offset, direction);
-	ok &= setRawUInt32(data, tlvsize, &offset, compressed_map._map.size());
-
-	for(uint32_t i=0;i<compressed_map._map.size() && ok;++i)
-		ok &= setRawUInt32(data, tlvsize, &offset, compressed_map._map[i]);
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-#ifdef RSSERIAL_DEBUG
-		std::cerr << "RsFileConfigSerialiser::serialiseTransfer() Size Error! " << std::endl;
-#endif
-	}
-
-	return ok;
-}
-
-bool RsTurtleChunkCrcRequestItem::serialize(void *data,uint32_t& pktsize) const
-{
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "RsTurtleChunkCrcRequestItem::serialize(): serializing packet:" << std::endl ;
-	print(std::cerr,2) ;
-#endif
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id);
-	ok &= setRawUInt32(data, tlvsize, &offset, chunk_number);
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-		std::cerr << "RsFileConfigSerialiser::serialiseTransfer() Size Error! " << std::endl;
-	}
-
-	return ok;
-}
-
-bool RsTurtleChunkCrcItem::serialize(void *data,uint32_t& pktsize) const
-{
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "RsTurtleChunkCrcRequestItem::serialize(): serializing packet:" << std::endl ;
-	print(std::cerr,2) ;
-#endif
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id);
-	ok &= setRawUInt32(data, tlvsize, &offset, chunk_number);
-	ok &= check_sum.serialise(data, tlvsize, offset) ;
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-		std::cerr << "RsFileConfigSerialiser::serialiseTransfer() Size Error! " << std::endl;
-	}
-
-	return ok;
-}
-RsTurtleFileMapItem::RsTurtleFileMapItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_MAP)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_MAP) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file map item" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-
-	/* add mandatory parts first */
-
-	bool ok = true ;
-	uint32_t s,d ;
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id);
-	ok &= getRawUInt32(data, pktsize, &offset, &d);
-	direction = d ;
-	ok &= getRawUInt32(data, pktsize, &offset, &s) ;
-
-	compressed_map._map.resize(s) ;
-
-	for(uint32_t i=0;i<s && ok;++i)
-		ok &= getRawUInt32(data, pktsize, &offset, &(compressed_map._map[i])) ;
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-#else
-	if (offset != pktsize)
-		throw std::runtime_error("Size error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("Unknown error while deserializing.") ;
-#endif
-}
-
-RsTurtleFileMapRequestItem::RsTurtleFileMapRequestItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_MAP_REQUEST)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_MAP_REQUEST) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file map request item" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-
-	/* add mandatory parts first */
-
-	bool ok = true ;
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id);
-	ok &= getRawUInt32(data, pktsize, &offset, &direction);
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-#else
-	if (offset != pktsize)
-		throw std::runtime_error("Size error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("Unknown error while deserializing.") ;
-#endif
-}
-
-RsTurtleChunkCrcItem::RsTurtleChunkCrcItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_CHUNK_CRC) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file map item" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-
-	/* add mandatory parts first */
-
-	bool ok = true ;
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id) ;
-	ok &= getRawUInt32(data, pktsize, &offset, &chunk_number) ;
-	ok &= check_sum.deserialise(data, pktsize, offset) ;
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-#else
-	if (offset != pktsize)
-		throw std::runtime_error("Size error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("Unknown error while deserializing.") ;
-#endif
-}
-
-RsTurtleChunkCrcRequestItem::RsTurtleChunkCrcRequestItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_CHUNK_CRC_REQUEST)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_CHUNK_CRC_REQUEST) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file map item" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-
-	/* add mandatory parts first */
-
-	bool ok = true ;
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id) ;
-	ok &= getRawUInt32(data, pktsize, &offset, &chunk_number) ;
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-#else
-	if (offset != pktsize)
-		throw std::runtime_error("Size error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("Unknown error while deserializing.") ;
-#endif
-}
-bool RsTurtleFileRequestItem::serialize(void *data,uint32_t& pktsize) const
-{
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id) ;
-	ok &= setRawUInt64(data, tlvsize, &offset, chunk_offset);
-	ok &= setRawUInt32(data, tlvsize, &offset, chunk_size);
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-#ifdef RSSERIAL_DEBUG
-		std::cerr << "RsTurtleTunnelOkItem::serialiseTransfer() Size Error! " << std::endl;
-#endif
-	}
-
-	return ok;
-}
-
-RsTurtleFileRequestItem::RsTurtleFileRequestItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_REQUEST)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_REQUEST) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file request" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-	uint32_t rssize = getRsItemSize(data);
-
-	/* add mandatory parts first */
-
-	bool ok = true ;
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id) ;
-	ok &= getRawUInt64(data, pktsize, &offset, &chunk_offset);
-	ok &= getRawUInt32(data, pktsize, &offset, &chunk_size);
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  tunnel_id=" << (void*)tunnel_id << ", chunk_offset=" << chunk_offset << ", chunk_size=" << chunk_size << std::endl ;
-#endif
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-	UNREFERENCED_LOCAL_VARIABLE(rssize);
-#else
-	if (offset != rssize)
-		throw std::runtime_error("RsTurtleTunnelOkItem::() error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("RsTurtleTunnelOkItem::() unknown error while deserializing.") ;
-#endif
-}
-	
-RsTurtleFileDataItem::~RsTurtleFileDataItem()
-{
-	free(chunk_data) ;
-}
-RsTurtleFileDataItem::RsTurtleFileDataItem(void *data,uint32_t pktsize)
-	: RsTurtleGenericTunnelItem(RS_TURTLE_SUBTYPE_FILE_DATA)
-{
-	setPriorityLevel(QOS_PRIORITY_RS_TURTLE_FILE_DATA) ;
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  type = file request" << std::endl ;
-#endif
-	uint32_t offset = 8; // skip the header 
-	uint32_t rssize = getRsItemSize(data);
-
-	bool ok = true ;
-    
-    	if(rssize > pktsize)
-            ok = false ;
-        
-	/* add mandatory parts first */
-	ok &= getRawUInt32(data, pktsize, &offset, &tunnel_id) ;
-	ok &= getRawUInt64(data, pktsize, &offset, &chunk_offset);
-	ok &= getRawUInt32(data, pktsize, &offset, &chunk_size);
-
-    	if(chunk_size > rssize || rssize - chunk_size < offset)
-	    throw std::runtime_error("RsTurtleFileDataItem::() error while deserializing.") ;
-        
-	chunk_data = (void*)rs_malloc(chunk_size) ;
-        
-        if(chunk_data == NULL)
-	    throw std::runtime_error("RsTurtleFileDataItem::() cannot allocate memory.") ;
-            
-	memcpy(chunk_data,(void*)((unsigned char*)data+offset),chunk_size) ;
-
-	offset += chunk_size ;
-
-#ifdef P3TURTLE_DEBUG
-	std::cerr << "  tunnel_id=" << (void*)tunnel_id << ", chunk_offset=" << chunk_offset << ", chunk_size=" << chunk_size << std::endl ;
-#endif
-
-#ifdef WINDOWS_SYS // No Exceptions in Windows compile. (drbobs).
-	UNREFERENCED_LOCAL_VARIABLE(rssize);
-#else
-	if (offset != rssize)
-		throw std::runtime_error("RsTurtleFileDataItem::() error while deserializing.") ;
-	if (!ok)
-		throw std::runtime_error("RsTurtleFileDataItem::() unknown error while deserializing.") ;
-#endif
-}
-
-bool RsTurtleFileDataItem::serialize(void *data,uint32_t& pktsize) const
-{
-	uint32_t tlvsize = serial_size();
-	uint32_t offset = 0;
-
-	if (pktsize < tlvsize)
-		return false; /* not enough space */
-
-	pktsize = tlvsize;
-
-	bool ok = true;
-
-	ok &= setRsItemHeader(data,tlvsize,PacketId(), tlvsize);
-
-	/* skip the header */
-	offset += 8;
-
-	/* add mandatory parts first */
-
-	ok &= setRawUInt32(data, tlvsize, &offset, tunnel_id) ;
-	ok &= setRawUInt64(data, tlvsize, &offset, chunk_offset);
-	ok &= setRawUInt32(data, tlvsize, &offset, chunk_size);
-
-	memcpy((void*)((unsigned char*)data+offset),chunk_data,chunk_size) ;
-	offset += chunk_size ;
-
-	if (offset != tlvsize)
-	{
-		ok = false;
-#ifdef RSSERIAL_DEBUG
-		std::cerr << "RsTurtleTunnelOkItem::serialiseTransfer() Size Error! " << std::endl;
-#endif
-	}
-
-	return ok;
-}
-std::ostream& RsTurtleFileRequestItem::print(std::ostream& o, uint16_t)
-{
-	o << "File request item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  offset    : " << chunk_offset << std::endl ;
-	o << "  chunk size: " << chunk_size << std::endl ;
-
-	return o ;
-}
-
-std::ostream& RsTurtleFileDataItem::print(std::ostream& o, uint16_t)
-{
-	o << "File request item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  offset    : " << chunk_offset << std::endl ;
-	o << "  chunk size: " << chunk_size << std::endl ;
-	o << "  data      : " << std::hex << chunk_data << std::dec << std::endl ;
-
-	return o ;
-}
-
-std::ostream& RsTurtleFileMapItem::print(std::ostream& o, uint16_t)
-{
-	o << "File map item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  direction : " << direction << std::endl ;
-	o << "  map      : " ;
-
-	for(uint32_t i=0;i<compressed_map._map.size();++i)
-		o << std::hex << compressed_map._map[i] << std::dec << std::endl ;
-
-	return o ;
-}
-
-std::ostream& RsTurtleFileMapRequestItem::print(std::ostream& o, uint16_t)
-{
-	o << "File map request item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  direction : " << direction << std::endl ;
-
-	return o ;
-}
-
-
-std::ostream& RsTurtleChunkCrcRequestItem::print(std::ostream& o, uint16_t)
-{
-	o << "Chunk CRC request item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  chunk num : " << chunk_number << std::endl ;
-
-	return o ;
-}
-std::ostream& RsTurtleChunkCrcItem::print(std::ostream& o, uint16_t)
-{
-	o << "Chunk CRC item:" << std::endl ;
-
-	o << "  tunnel id : " << std::hex << tunnel_id << std::dec << std::endl ;
-	o << "  chunk num : " << chunk_number << std::endl ;
-	o << "   sha1 sum : " << check_sum.toStdString() << std::endl ;
-
-	return o ;
-}
-
-#endif
-
 void RsTurtleFileMapItem::serial_process(SerializeJob j,SerializeContext& ctx)
 {
     RsTypeSerializer::serial_process<uint32_t>(j,ctx,tunnel_id,"tunnel_id") ;
diff --git a/libretroshare/src/grouter/grouteritems.h b/libretroshare/src/grouter/grouteritems.h
index a0c3dd9e7..af78866c0 100644
--- a/libretroshare/src/grouter/grouteritems.h
+++ b/libretroshare/src/grouter/grouteritems.h
@@ -29,7 +29,7 @@
 
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "retroshare/rstypes.h"
 
 #include "retroshare/rsgrouter.h"
diff --git a/libretroshare/src/gxstunnel/rsgxstunnelitems.h b/libretroshare/src/gxstunnel/rsgxstunnelitems.h
index c23a8b9a1..ad049a753 100644
--- a/libretroshare/src/gxstunnel/rsgxstunnelitems.h
+++ b/libretroshare/src/gxstunnel/rsgxstunnelitems.h
@@ -29,7 +29,7 @@
 
 #include "retroshare/rstypes.h"
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "serialiser/rstlvidset.h"
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 1b437282c..2d7a966e9 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -452,15 +452,15 @@ HEADERS +=  grouter/groutercache.h \
 				grouter/groutertypes.h \
 				grouter/rsgrouterclient.h 
 
-HEADERS +=	serialiser/itempriorities.h \
+HEADERS +=	rsitems/itempriorities.h \
 			serialiser/rsbaseserial.h \
-			serialiser/rsfiletransferitems.h \
+			rsitems/rsfiletransferitems.h \
 			serialiser/rsserviceserialiser.h \
 			serialiser/rsconfigitems.h \
 			serialiser/rshistoryitems.h \
 			serialiser/rsmsgitems.h \
 			serialiser/rsserial.h \
-			serialiser/rsserviceids.h \
+			rsitems/rsserviceids.h \
 			serialiser/rsserviceitems.h \
 			serialiser/rsstatusitems.h \
 			serialiser/rstlvaddrs.h \
@@ -479,8 +479,8 @@ HEADERS +=	serialiser/itempriorities.h \
 			serialiser/rstlvlist.h \
 			serialiser/rstlvmaps.h \
 			serialiser/rstlvbanlist.h \
-			serialiser/rsbanlistitems.h \
-			serialiser/rsbwctrlitems.h \
+			rsitems/rsbanlistitems.h \
+			rsitems/rsbwctrlitems.h \
 			serialiser/rsdiscovery2items.h \
 			serialiser/rsheartbeatitems.h \
 			serialiser/rsrttitems.h \
@@ -608,7 +608,7 @@ SOURCES += plugins/pluginmanager.cc \
 				serialiser/rspluginitems.cc
 
 SOURCES +=	serialiser/rsbaseserial.cc \
-			serialiser/rsfiletransferitems.cc \
+			rsitems/rsfiletransferitems.cc \
 			serialiser/rsserviceserialiser.cc \
 			serialiser/rsconfigitems.cc \
 			serialiser/rshistoryitems.cc \
@@ -627,8 +627,8 @@ SOURCES +=	serialiser/rsbaseserial.cc \
 			serialiser/rstlvkeyvalue.cc \
 			serialiser/rstlvgenericparam.cc \
 			serialiser/rstlvbanlist.cc \
-			serialiser/rsbanlistitems.cc \
-			serialiser/rsbwctrlitems.cc \
+			rsitems/rsbanlistitems.cc \
+			rsitems/rsbwctrlitems.cc \
 			serialiser/rsdiscovery2items.cc \
 			serialiser/rsheartbeatitems.cc \
 			serialiser/rsrttitems.cc \
diff --git a/libretroshare/src/pqi/p3servicecontrol.cc b/libretroshare/src/pqi/p3servicecontrol.cc
index a397a4e1c..f22cc44c0 100644
--- a/libretroshare/src/pqi/p3servicecontrol.cc
+++ b/libretroshare/src/pqi/p3servicecontrol.cc
@@ -26,7 +26,7 @@
 #include <iostream>
 
 #include "p3servicecontrol.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rsbaseserial.h"
 #include "pqi/p3cfgmgr.h"
diff --git a/libretroshare/src/serialiser/itempriorities.h b/libretroshare/src/rsitems/itempriorities.h
similarity index 100%
rename from libretroshare/src/serialiser/itempriorities.h
rename to libretroshare/src/rsitems/itempriorities.h
diff --git a/libretroshare/src/serialiser/rsbanlistitems.cc b/libretroshare/src/rsitems/rsbanlistitems.cc
similarity index 98%
rename from libretroshare/src/serialiser/rsbanlistitems.cc
rename to libretroshare/src/rsitems/rsbanlistitems.cc
index c28399e34..d597abcfd 100644
--- a/libretroshare/src/serialiser/rsbanlistitems.cc
+++ b/libretroshare/src/rsitems/rsbanlistitems.cc
@@ -24,7 +24,7 @@
  */
 
 #include "serialiser/rsbaseserial.h"
-#include "serialiser/rsbanlistitems.h"
+#include "rsitems/rsbanlistitems.h"
 
 #include "serialization/rstypeserializer.h"
 
diff --git a/libretroshare/src/serialiser/rsbanlistitems.h b/libretroshare/src/rsitems/rsbanlistitems.h
similarity index 98%
rename from libretroshare/src/serialiser/rsbanlistitems.h
rename to libretroshare/src/rsitems/rsbanlistitems.h
index 57263a356..cc3f96eeb 100644
--- a/libretroshare/src/serialiser/rsbanlistitems.h
+++ b/libretroshare/src/rsitems/rsbanlistitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rstlvbanlist.h"
 #include "serialization/rsserializer.h"
 
diff --git a/libretroshare/src/serialiser/rsbwctrlitems.cc b/libretroshare/src/rsitems/rsbwctrlitems.cc
similarity index 99%
rename from libretroshare/src/serialiser/rsbwctrlitems.cc
rename to libretroshare/src/rsitems/rsbwctrlitems.cc
index 092b1d643..747dbbbda 100644
--- a/libretroshare/src/serialiser/rsbwctrlitems.cc
+++ b/libretroshare/src/rsitems/rsbwctrlitems.cc
@@ -24,7 +24,7 @@
  */
 
 #include "serialiser/rsbaseserial.h"
-#include "serialiser/rsbwctrlitems.h"
+#include "rsitems/rsbwctrlitems.h"
 
 /***
 #define RSSERIAL_DEBUG 1
diff --git a/libretroshare/src/serialiser/rsbwctrlitems.h b/libretroshare/src/rsitems/rsbwctrlitems.h
similarity index 98%
rename from libretroshare/src/serialiser/rsbwctrlitems.h
rename to libretroshare/src/rsitems/rsbwctrlitems.h
index 07907c709..e9262cd5b 100644
--- a/libretroshare/src/serialiser/rsbwctrlitems.h
+++ b/libretroshare/src/rsitems/rsbwctrlitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 
diff --git a/libretroshare/src/serialiser/rsfiletransferitems.cc b/libretroshare/src/rsitems/rsfiletransferitems.cc
similarity index 99%
rename from libretroshare/src/serialiser/rsfiletransferitems.cc
rename to libretroshare/src/rsitems/rsfiletransferitems.cc
index 3eb7c1147..acdadaff2 100644
--- a/libretroshare/src/serialiser/rsfiletransferitems.cc
+++ b/libretroshare/src/rsitems/rsfiletransferitems.cc
@@ -26,7 +26,7 @@
 
 #include "serialiser/rsbaseserial.h"
 #include "serialiser/rstlvbase.h"
-#include "serialiser/rsfiletransferitems.h"
+#include "rsitems/rsfiletransferitems.h"
 
 #include "serialization/rstypeserializer.h"
 
diff --git a/libretroshare/src/serialiser/rsfiletransferitems.h b/libretroshare/src/rsitems/rsfiletransferitems.h
similarity index 99%
rename from libretroshare/src/serialiser/rsfiletransferitems.h
rename to libretroshare/src/rsitems/rsfiletransferitems.h
index ae1835126..5cfed03b9 100644
--- a/libretroshare/src/serialiser/rsfiletransferitems.h
+++ b/libretroshare/src/rsitems/rsfiletransferitems.h
@@ -30,7 +30,7 @@
 #include "retroshare/rstypes.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvfileitem.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 
 #include "serialization/rsserializer.h"
 
diff --git a/libretroshare/src/serialiser/rsserviceids.h b/libretroshare/src/rsitems/rsserviceids.h
similarity index 100%
rename from libretroshare/src/serialiser/rsserviceids.h
rename to libretroshare/src/rsitems/rsserviceids.h
diff --git a/libretroshare/src/serialiser/rsdiscovery2items.cc b/libretroshare/src/serialiser/rsdiscovery2items.cc
index 611a7e80a..90b4313b3 100644
--- a/libretroshare/src/serialiser/rsdiscovery2items.cc
+++ b/libretroshare/src/serialiser/rsdiscovery2items.cc
@@ -29,7 +29,7 @@
 
 #if 0
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvtypes.h"
diff --git a/libretroshare/src/serialiser/rsdiscovery2items.h b/libretroshare/src/serialiser/rsdiscovery2items.h
index dad0d0fb5..26bbf1f22 100644
--- a/libretroshare/src/serialiser/rsdiscovery2items.h
+++ b/libretroshare/src/serialiser/rsdiscovery2items.h
@@ -31,7 +31,7 @@
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvidset.h"
 #include "serialiser/rstlvaddrs.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.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/serialiser/rsdsdvitems.h b/libretroshare/src/serialiser/rsdsdvitems.h
index efafa1f4b..fd03be486 100644
--- a/libretroshare/src/serialiser/rsdsdvitems.h
+++ b/libretroshare/src/serialiser/rsdsdvitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvbinary.h"
diff --git a/libretroshare/src/serialiser/rsgxschannelitems.h b/libretroshare/src/serialiser/rsgxschannelitems.h
index f7386b93d..9a937e581 100644
--- a/libretroshare/src/serialiser/rsgxschannelitems.h
+++ b/libretroshare/src/serialiser/rsgxschannelitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 #include "serialiser/rstlvfileitem.h"
diff --git a/libretroshare/src/serialiser/rsgxscircleitems.h b/libretroshare/src/serialiser/rsgxscircleitems.h
index 4ae4e7109..84316b133 100644
--- a/libretroshare/src/serialiser/rsgxscircleitems.h
+++ b/libretroshare/src/serialiser/rsgxscircleitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvitem.h"
 #include "serialiser/rstlvstring.h"
diff --git a/libretroshare/src/serialiser/rsgxscommentitems.h b/libretroshare/src/serialiser/rsgxscommentitems.h
index 6f5d1bddd..2ccd6d5d8 100644
--- a/libretroshare/src/serialiser/rsgxscommentitems.h
+++ b/libretroshare/src/serialiser/rsgxscommentitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/serialiser/rsgxsforumitems.h b/libretroshare/src/serialiser/rsgxsforumitems.h
index f4bce076d..97f6dd89b 100644
--- a/libretroshare/src/serialiser/rsgxsforumitems.h
+++ b/libretroshare/src/serialiser/rsgxsforumitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/serialiser/rsgxsiditems.h b/libretroshare/src/serialiser/rsgxsiditems.h
index 483916055..39ca6882a 100644
--- a/libretroshare/src/serialiser/rsgxsiditems.h
+++ b/libretroshare/src/serialiser/rsgxsiditems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "rsgxsitems.h"
diff --git a/libretroshare/src/serialiser/rsgxsitems.h b/libretroshare/src/serialiser/rsgxsitems.h
index 4e46a39a4..ed6d3124d 100644
--- a/libretroshare/src/serialiser/rsgxsitems.h
+++ b/libretroshare/src/serialiser/rsgxsitems.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 //#include "serialiser/rstlvkeys.h"
diff --git a/libretroshare/src/serialiser/rsgxsrecognitems.h b/libretroshare/src/serialiser/rsgxsrecognitems.h
index a8aad7c31..6d0ea0ae6 100644
--- a/libretroshare/src/serialiser/rsgxsrecognitems.h
+++ b/libretroshare/src/serialiser/rsgxsrecognitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvkeys.h"
 #include "serialiser/rstlvidset.h"
diff --git a/libretroshare/src/serialiser/rsgxsreputationitems.h b/libretroshare/src/serialiser/rsgxsreputationitems.h
index 0fdc40ee2..9d5383343 100644
--- a/libretroshare/src/serialiser/rsgxsreputationitems.h
+++ b/libretroshare/src/serialiser/rsgxsreputationitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvidset.h"
 #include "retroshare/rsgxsifacetypes.h"
diff --git a/libretroshare/src/serialiser/rsgxsupdateitems.h b/libretroshare/src/serialiser/rsgxsupdateitems.h
index b7d6f324c..7d6c89907 100644
--- a/libretroshare/src/serialiser/rsgxsupdateitems.h
+++ b/libretroshare/src/serialiser/rsgxsupdateitems.h
@@ -30,7 +30,7 @@
 
 #if 0
 #include <map>
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvtypes.h"
diff --git a/libretroshare/src/serialiser/rsheartbeatitems.cc b/libretroshare/src/serialiser/rsheartbeatitems.cc
index 55f1e844a..0151525a2 100644
--- a/libretroshare/src/serialiser/rsheartbeatitems.cc
+++ b/libretroshare/src/serialiser/rsheartbeatitems.cc
@@ -25,7 +25,7 @@
  */
 
 #include "serialiser/rsbaseserial.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsheartbeatitems.h"
 
 /***
diff --git a/libretroshare/src/serialiser/rsheartbeatitems.h b/libretroshare/src/serialiser/rsheartbeatitems.h
index cfabae2ee..5660ba373 100644
--- a/libretroshare/src/serialiser/rsheartbeatitems.h
+++ b/libretroshare/src/serialiser/rsheartbeatitems.h
@@ -29,7 +29,7 @@
 #define RS_HEARTBEAT_ITEMS_H
 
 #include "serialiser/rsserial.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 
 const uint8_t RS_PKT_SUBTYPE_HEARTBEAT_PULSE    = 0x01;
 
diff --git a/libretroshare/src/serialiser/rshistoryitems.h b/libretroshare/src/serialiser/rshistoryitems.h
index 039bf095f..72f186561 100644
--- a/libretroshare/src/serialiser/rshistoryitems.h
+++ b/libretroshare/src/serialiser/rshistoryitems.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "retroshare/rstypes.h"
 
diff --git a/libretroshare/src/serialiser/rsmsgitems.h b/libretroshare/src/serialiser/rsmsgitems.h
index 1a7e84cd0..0d44aa501 100644
--- a/libretroshare/src/serialiser/rsmsgitems.h
+++ b/libretroshare/src/serialiser/rsmsgitems.h
@@ -30,7 +30,7 @@
 
 #include "retroshare/rstypes.h"
 #include "serialiser/rstlvkeys.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "serialiser/rstlvidset.h"
diff --git a/libretroshare/src/serialiser/rsnxsitems.h b/libretroshare/src/serialiser/rsnxsitems.h
index 88f0ca914..259c560a6 100644
--- a/libretroshare/src/serialiser/rsnxsitems.h
+++ b/libretroshare/src/serialiser/rsnxsitems.h
@@ -30,7 +30,7 @@
 #include <map>
 #include <openssl/ssl.h>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvitem.h"
diff --git a/libretroshare/src/serialiser/rsphotoitems.h b/libretroshare/src/serialiser/rsphotoitems.h
index 40fa8b32b..a935472e6 100644
--- a/libretroshare/src/serialiser/rsphotoitems.h
+++ b/libretroshare/src/serialiser/rsphotoitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "rsgxsitems.h"
diff --git a/libretroshare/src/serialiser/rsposteditems.h b/libretroshare/src/serialiser/rsposteditems.h
index 6fa08f203..a303f0d33 100644
--- a/libretroshare/src/serialiser/rsposteditems.h
+++ b/libretroshare/src/serialiser/rsposteditems.h
@@ -1,7 +1,7 @@
 #ifndef RSPOSTEDITEMS_H
 #define RSPOSTEDITEMS_H
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/serialiser/rsrttitems.h b/libretroshare/src/serialiser/rsrttitems.h
index 2ebbbb51b..11a6b8889 100644
--- a/libretroshare/src/serialiser/rsrttitems.h
+++ b/libretroshare/src/serialiser/rsrttitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 /**************************************************************************/
diff --git a/libretroshare/src/serialiser/rsserial.h b/libretroshare/src/serialiser/rsserial.h
index 21e0fcec7..ffa9bb855 100644
--- a/libretroshare/src/serialiser/rsserial.h
+++ b/libretroshare/src/serialiser/rsserial.h
@@ -60,7 +60,7 @@
  ******************************************************************/
 
 #include <util/smallobject.h>
-#include "itempriorities.h"
+#include "rsitems/itempriorities.h"
 
 const uint8_t RS_PKT_VERSION1        = 0x01;
 const uint8_t RS_PKT_VERSION_SERVICE = 0x02;
diff --git a/libretroshare/src/serialiser/rsserviceinfoitems.h b/libretroshare/src/serialiser/rsserviceinfoitems.h
index 295ca4f6b..76b451cce 100644
--- a/libretroshare/src/serialiser/rsserviceinfoitems.h
+++ b/libretroshare/src/serialiser/rsserviceinfoitems.h
@@ -30,7 +30,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvgenericmap.h"
diff --git a/libretroshare/src/serialiser/rsstatusitems.h b/libretroshare/src/serialiser/rsstatusitems.h
index 8677c2be0..c6cc0c8b2 100644
--- a/libretroshare/src/serialiser/rsstatusitems.h
+++ b/libretroshare/src/serialiser/rsstatusitems.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 /**************************************************************************/
diff --git a/libretroshare/src/serialiser/rswikiitems.h b/libretroshare/src/serialiser/rswikiitems.h
index e45eab729..4247f9d3b 100644
--- a/libretroshare/src/serialiser/rswikiitems.h
+++ b/libretroshare/src/serialiser/rswikiitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/serialiser/rswireitems.h b/libretroshare/src/serialiser/rswireitems.h
index 72d1732a6..77258707a 100644
--- a/libretroshare/src/serialiser/rswireitems.h
+++ b/libretroshare/src/serialiser/rswireitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 //#include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/services/p3banlist.cc b/libretroshare/src/services/p3banlist.cc
index 157cc23f8..bf72ea815 100644
--- a/libretroshare/src/services/p3banlist.cc
+++ b/libretroshare/src/services/p3banlist.cc
@@ -30,7 +30,7 @@
 #include "util/rsnet.h"
 
 #include "services/p3banlist.h"
-#include "serialiser/rsbanlistitems.h"
+#include "rsitems/rsbanlistitems.h"
 #include "serialiser/rsconfigitems.h"
 #include "retroshare/rsdht.h"
 #include "retroshare/rsbanlist.h"
diff --git a/libretroshare/src/services/p3banlist.h b/libretroshare/src/services/p3banlist.h
index 87bb7104a..7cdc983a5 100644
--- a/libretroshare/src/services/p3banlist.h
+++ b/libretroshare/src/services/p3banlist.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <map>
 
-#include "serialiser/rsbanlistitems.h"
+#include "rsitems/rsbanlistitems.h"
 #include "services/p3service.h"
 #include "retroshare/rsbanlist.h"
 
diff --git a/libretroshare/src/services/p3bwctrl.cc b/libretroshare/src/services/p3bwctrl.cc
index 1cf4da87f..aa9106e47 100644
--- a/libretroshare/src/services/p3bwctrl.cc
+++ b/libretroshare/src/services/p3bwctrl.cc
@@ -30,7 +30,7 @@
 #include "util/rsnet.h"
 
 #include "services/p3bwctrl.h"
-#include "serialiser/rsbwctrlitems.h"
+#include "rsitems/rsbwctrlitems.h"
 
 #include <sys/time.h>
 
diff --git a/libretroshare/src/services/p3bwctrl.h b/libretroshare/src/services/p3bwctrl.h
index 94c746aa8..9e80bb188 100644
--- a/libretroshare/src/services/p3bwctrl.h
+++ b/libretroshare/src/services/p3bwctrl.h
@@ -31,7 +31,7 @@
 #include <list>
 #include <map>
 
-#include "serialiser/rsbwctrlitems.h"
+#include "rsitems/rsbwctrlitems.h"
 #include "services/p3service.h"
 #include "pqi/pqiservicemonitor.h"
 #include "retroshare/rsconfig.h" // for datatypes.
diff --git a/libretroshare/src/services/p3serviceinfo.cc b/libretroshare/src/services/p3serviceinfo.cc
index 0965914e0..0782016a1 100644
--- a/libretroshare/src/services/p3serviceinfo.cc
+++ b/libretroshare/src/services/p3serviceinfo.cc
@@ -29,7 +29,7 @@
 #include "util/rsnet.h"
 
 #include "services/p3serviceinfo.h"
-#include "serialiser/rsbanlistitems.h"
+#include "rsitems/rsbanlistitems.h"
 
 #include <sys/time.h>
 
diff --git a/libretroshare/src/turtle/rsturtleitem.h b/libretroshare/src/turtle/rsturtleitem.h
index 95594761b..0249cce22 100644
--- a/libretroshare/src/turtle/rsturtleitem.h
+++ b/libretroshare/src/turtle/rsturtleitem.h
@@ -6,7 +6,7 @@
 #include "retroshare/rsturtle.h"
 #include "retroshare/rsexpr.h"
 #include "retroshare/rstypes.h"
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "turtle/turtletypes.h"
 
 #include "serialization/rsserializer.h"
diff --git a/plugins/FeedReader/FeedReaderPlugin.h b/plugins/FeedReader/FeedReaderPlugin.h
index 9a27d9243..12b45db20 100644
--- a/plugins/FeedReader/FeedReaderPlugin.h
+++ b/plugins/FeedReader/FeedReaderPlugin.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <serialiser/rsserviceids.h>
+#include <rsitems/rsserviceids.h>
 #include <retroshare/rsplugin.h>
 #include <retroshare-gui/mainpage.h>
 #include "services/p3FeedReader.h"
diff --git a/plugins/FeedReader/services/rsFeedReaderItems.h b/plugins/FeedReader/services/rsFeedReaderItems.h
index 14f6d0e6e..da4e4fa72 100644
--- a/plugins/FeedReader/services/rsFeedReaderItems.h
+++ b/plugins/FeedReader/services/rsFeedReaderItems.h
@@ -22,7 +22,7 @@
 #ifndef RS_FEEDREADER_ITEMS_H
 #define RS_FEEDREADER_ITEMS_H
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvstring.h"
 
diff --git a/plugins/VOIP/services/rsVOIPItems.h b/plugins/VOIP/services/rsVOIPItems.h
index 7d083fde5..a685f9ef6 100644
--- a/plugins/VOIP/services/rsVOIPItems.h
+++ b/plugins/VOIP/services/rsVOIPItems.h
@@ -48,7 +48,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 /**************************************************************************/
diff --git a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h
index 8a367cfc3..78379436f 100644
--- a/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h
+++ b/tests/unittests/libretroshare/services/gxs/rsgxstestitems.h
@@ -27,7 +27,7 @@
 
 #include <map>
 
-#include "serialiser/rsserviceids.h"
+#include "rsitems/rsserviceids.h"
 #include "serialiser/rsserial.h"
 
 #include "serialiser/rsgxsitems.h"