Index: trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.cpp (revision 555)
+++ trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_vendor_dependent_cmd.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -45,5 +45,5 @@
 
 bool
-VendorDependentCmd::serialize( IOSSerialize& se )
+VendorDependentCmd::serialize( Util::IOSSerialize& se )
 {
     bool result=true;
@@ -60,5 +60,5 @@
 
 bool
-VendorDependentCmd::deserialize( IISDeserialize& de )
+VendorDependentCmd::deserialize( Util::IISDeserialize& de )
 {
     bool result=true;
Index: trunk/libffado/src/libavc/general/avc_plug.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_plug.cpp (revision 612)
+++ trunk/libffado/src/libavc/general/avc_plug.cpp (revision 618)
@@ -32,5 +32,5 @@
 
 #include "libieee1394/ieee1394service.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 
 #include <sstream>
Index: trunk/libffado/src/libavc/general/avc_extended_plug_info.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_plug_info.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_extended_plug_info.h (revision 618)
@@ -52,6 +52,6 @@
     virtual ~ExtendedPlugInfoPlugTypeSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugTypeSpecificData* clone() const;
 
@@ -71,6 +71,6 @@
     virtual ~ExtendedPlugInfoPlugNameSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugNameSpecificData* clone() const;
 
@@ -86,6 +86,6 @@
     virtual ~ExtendedPlugInfoPlugNumberOfChannelsSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugNumberOfChannelsSpecificData* clone() const;
 
@@ -133,6 +133,6 @@
     virtual ~ExtendedPlugInfoPlugChannelPositionSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugChannelPositionSpecificData* clone() const;
 
@@ -151,6 +151,6 @@
     virtual ~ExtendedPlugInfoPlugChannelNameSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugChannelNameSpecificData* clone() const;
 
@@ -169,6 +169,6 @@
     virtual ~ExtendedPlugInfoPlugInputSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugInputSpecificData* clone() const;
 
@@ -186,6 +186,6 @@
     virtual ~ExtendedPlugInfoPlugOutputSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoPlugOutputSpecificData* clone() const;
 
@@ -219,6 +219,6 @@
     virtual ~ExtendedPlugInfoClusterInfoSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoClusterInfoSpecificData* clone() const;
 
@@ -262,6 +262,6 @@
     bool initialize();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedPlugInfoInfoType* clone() const;
 
@@ -299,6 +299,6 @@
     virtual ~ExtendedPlugInfoCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     bool setPlugAddress( const PlugAddress& plugAddress );
Index: trunk/libffado/src/libavc/general/avc_subunit_info.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_subunit_info.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_subunit_info.h (revision 618)
@@ -40,6 +40,6 @@
     virtual ~SubUnitInfoCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.h (revision 555)
+++ trunk/libffado/src/libavc/general/avc_vendor_dependent_cmd.h (revision 618)
@@ -36,6 +36,6 @@
     virtual ~VendorDependentCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_generic.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_generic.cpp (revision 503)
+++ trunk/libffado/src/libavc/general/avc_generic.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_generic.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -53,7 +53,7 @@
 
 bool
-AVCCommand::serialize( IOSSerialize& se )
-{
-    // XXX \todo improve IOSSerialize::write interface
+AVCCommand::serialize( Util::IOSSerialize& se )
+{
+    // XXX \todo improve Util::IOSSerialize::write interface
     char* buf;
     asprintf( &buf, "AVCCommand ctype ('%s')",
@@ -72,5 +72,5 @@
 
 bool
-AVCCommand::deserialize( IISDeserialize& de )
+AVCCommand::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_ctype );
@@ -181,5 +181,5 @@
     memset( &m_fcpFrame,  0x0,  sizeof( m_fcpFrame ) );
 
-    BufferSerialize se( m_fcpFrame, sizeof( m_fcpFrame ) );
+    Util::BufferSerialize se( m_fcpFrame, sizeof( m_fcpFrame ) );
     if ( !serialize( se ) ) {
         debugFatal(  "fire: Could not serialize\n" );
@@ -194,5 +194,5 @@
         showFcpFrame( m_fcpFrame, fcpFrameSize );
 
-        StringSerializer se_dbg;
+        Util::StringSerializer se_dbg;
         serialize( se_dbg );
         
@@ -226,5 +226,5 @@
         case eR_NotImplemented:
         {
-            BufferDeserialize de( buf, resp_len );
+            Util::BufferDeserialize de( buf, resp_len );
             result = deserialize( de );
 
@@ -232,5 +232,5 @@
             showFcpFrame( buf, de.getNrOfConsumedBytes() );
 
-            StringSerializer se_dbg;
+            Util::StringSerializer se_dbg;
             serialize( se_dbg );
 
@@ -251,5 +251,5 @@
             debugOutputShort( DEBUG_LEVEL_VERY_VERBOSE,"  Response:\n");
 
-            BufferDeserialize de( buf, resp_len );
+            Util::BufferDeserialize de( buf, resp_len );
             deserialize( de );
 
Index: trunk/libffado/src/libavc/general/avc_extended_cmd_generic.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_cmd_generic.cpp (revision 503)
+++ trunk/libffado/src/libavc/general/avc_extended_cmd_generic.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_extended_cmd_generic.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -40,5 +40,5 @@
 
 bool
-UnitPlugAddress::serialize( IOSSerialize& se )
+UnitPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugType, "UnitPlugAddress plugType" );
@@ -49,5 +49,5 @@
 
 bool
-UnitPlugAddress::deserialize( IISDeserialize& de )
+UnitPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugType );
@@ -77,5 +77,5 @@
 
 bool
-SubunitPlugAddress::serialize( IOSSerialize& se )
+SubunitPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugId, "SubunitPlugAddress plugId" );
@@ -86,5 +86,5 @@
 
 bool
-SubunitPlugAddress::deserialize( IISDeserialize& de )
+SubunitPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugId );
@@ -116,5 +116,5 @@
 
 bool
-FunctionBlockPlugAddress::serialize( IOSSerialize& se )
+FunctionBlockPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_functionBlockType, "FunctionBlockPlugAddress functionBlockType" );
@@ -125,5 +125,5 @@
 
 bool
-FunctionBlockPlugAddress::deserialize( IISDeserialize& de )
+FunctionBlockPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_functionBlockType );
@@ -153,5 +153,5 @@
 
 bool
-UndefinedPlugAddress::serialize( IOSSerialize& se )
+UndefinedPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_reserved0, "UndefinedPlugAddress reserved0" );
@@ -162,5 +162,5 @@
 
 bool
-UndefinedPlugAddress::deserialize( IISDeserialize& de )
+UndefinedPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_reserved0 );
@@ -193,5 +193,5 @@
 
 bool
-UnitPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+UnitPlugSpecificDataPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugType,  "UnitPlugSpecificDataPlugAddress plugType" );
@@ -204,5 +204,5 @@
 
 bool
-UnitPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+UnitPlugSpecificDataPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugType );
@@ -239,5 +239,5 @@
 
 bool
-SubunitPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+SubunitPlugSpecificDataPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_subunitType,  "SubunitPlugSpecificDataPlugAddress subunitType" );
@@ -250,5 +250,5 @@
 
 bool
-SubunitPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+SubunitPlugSpecificDataPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_subunitType );
@@ -287,5 +287,5 @@
 
 bool
-FunctionBlockPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+FunctionBlockPlugSpecificDataPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_subunitType,       "FunctionPlugSpecificDataBlockPlugAddress subunitType" );
@@ -298,5 +298,5 @@
 
 bool
-FunctionBlockPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+FunctionBlockPlugSpecificDataPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_subunitType );
@@ -330,5 +330,5 @@
 
 bool
-UndefinedPlugSpecificDataPlugAddress::serialize( IOSSerialize& se )
+UndefinedPlugSpecificDataPlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_reserved0, "UndefinedPlugAddress reserved0" );
@@ -341,5 +341,5 @@
 
 bool
-UndefinedPlugSpecificDataPlugAddress::deserialize( IISDeserialize& de )
+UndefinedPlugSpecificDataPlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_reserved0 );
@@ -408,5 +408,5 @@
 
 bool
-PlugAddress::serialize( IOSSerialize& se )
+PlugAddress::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugDirection, "PlugAddress plugDirection" );
@@ -416,5 +416,5 @@
 
 bool
-PlugAddress::deserialize( IISDeserialize& de )
+PlugAddress::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugDirection );
@@ -506,5 +506,5 @@
 
 bool
-PlugAddressSpecificData::serialize( IOSSerialize& se )
+PlugAddressSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugDirection, "PlugAddressSpecificData plugDirection" );
@@ -514,5 +514,5 @@
 
 bool
-PlugAddressSpecificData::deserialize( IISDeserialize& de )
+PlugAddressSpecificData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugDirection );
Index: trunk/libffado/src/libavc/general/avc_unit.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_unit.cpp (revision 560)
+++ trunk/libffado/src/libavc/general/avc_unit.cpp (revision 618)
@@ -34,5 +34,5 @@
 #include "../general/avc_subunit_info.h"
 #include "../streamformat/avc_extended_stream_format.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "../avc_definitions.h"
 
Index: trunk/libffado/src/libavc/general/avc_generic.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_generic.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_generic.h (revision 618)
@@ -34,8 +34,10 @@
 class Ieee1394Service;
 
+namespace Util {
+    class IOSSerialize;
+    class IISDeserialize;
+};
+
 namespace AVC {
-
-class IOSSerialize;
-class IISDeserialize;
 
 const int fcpFrameMaxLength = 512;
@@ -53,6 +55,6 @@
     virtual ~IBusData() {}
 
-    virtual bool serialize( IOSSerialize& se ) = 0;
-    virtual bool deserialize( IISDeserialize& de ) = 0;
+    virtual bool serialize( Util::IOSSerialize& se ) = 0;
+    virtual bool deserialize( Util::IISDeserialize& de ) = 0;
 
     virtual IBusData* clone() const = 0;
@@ -85,6 +87,6 @@
     };
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual bool setCommandType( ECommandType commandType );
Index: trunk/libffado/src/libavc/general/avc_plug_info.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_plug_info.cpp (revision 612)
+++ trunk/libffado/src/libavc/general/avc_plug_info.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_plug_info.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -80,5 +80,5 @@
 
 bool
-PlugInfoCmd::serialize( IOSSerialize& se )
+PlugInfoCmd::serialize( Util::IOSSerialize& se )
 {
     byte_t reserved = 0xff;
@@ -116,5 +116,5 @@
 
 bool
-PlugInfoCmd::deserialize( IISDeserialize& de )
+PlugInfoCmd::deserialize( Util::IISDeserialize& de )
 {
     byte_t reserved;
Index: trunk/libffado/src/libavc/general/avc_extended_subunit_info.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_subunit_info.cpp (revision 503)
+++ trunk/libffado/src/libavc/general/avc_extended_subunit_info.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_extended_subunit_info.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -48,5 +48,5 @@
 
 bool
-ExtendedSubunitInfoPageData::serialize( IOSSerialize& se )
+ExtendedSubunitInfoPageData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_functionBlockType, "ExtendedSubunitInfoPageData: function block type" );
@@ -60,5 +60,5 @@
 
 bool
-ExtendedSubunitInfoPageData::deserialize( IISDeserialize& de )
+ExtendedSubunitInfoPageData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_functionBlockType );
@@ -111,5 +111,5 @@
 
 bool
-ExtendedSubunitInfoCmd::serialize( IOSSerialize& se )
+ExtendedSubunitInfoCmd::serialize( Util::IOSSerialize& se )
 {
     bool status = false;
@@ -135,5 +135,5 @@
 
 bool
-ExtendedSubunitInfoCmd::deserialize( IISDeserialize& de )
+ExtendedSubunitInfoCmd::deserialize( Util::IISDeserialize& de )
 {
     bool status = false;
Index: trunk/libffado/src/libavc/general/avc_extended_cmd_generic.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_cmd_generic.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_extended_cmd_generic.h (revision 618)
@@ -49,6 +49,6 @@
     virtual ~UnitPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual UnitPlugAddress* clone() const;
 
@@ -66,6 +66,6 @@
     virtual ~SubunitPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual SubunitPlugAddress* clone() const;
 
@@ -86,6 +86,6 @@
     virtual ~FunctionBlockPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual FunctionBlockPlugAddress* clone() const;
 
@@ -103,6 +103,6 @@
     virtual ~UndefinedPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual UndefinedPlugAddress* clone() const;
 
@@ -128,6 +128,6 @@
     virtual ~UnitPlugSpecificDataPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual UnitPlugSpecificDataPlugAddress* clone() const;
 
@@ -149,6 +149,6 @@
     virtual ~SubunitPlugSpecificDataPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual SubunitPlugSpecificDataPlugAddress* clone() const;
 
@@ -172,6 +172,6 @@
     virtual ~FunctionBlockPlugSpecificDataPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual FunctionBlockPlugSpecificDataPlugAddress* clone() const;
 
@@ -191,6 +191,6 @@
     virtual ~UndefinedPlugSpecificDataPlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual UndefinedPlugSpecificDataPlugAddress* clone() const;
 
@@ -234,6 +234,6 @@
     virtual ~PlugAddress();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual PlugAddress* clone() const;
@@ -278,6 +278,6 @@
     virtual ~PlugAddressSpecificData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual PlugAddressSpecificData* clone() const;
Index: trunk/libffado/src/libavc/general/avc_signal_format.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_signal_format.cpp (revision 524)
+++ trunk/libffado/src/libavc/general/avc_signal_format.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_signal_format.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -50,5 +50,5 @@
 
 bool
-OutputPlugSignalFormatCmd::serialize( IOSSerialize& se )
+OutputPlugSignalFormatCmd::serialize( Util::IOSSerialize& se )
 {
     bool result=true;
@@ -71,5 +71,5 @@
 
 bool
-OutputPlugSignalFormatCmd::deserialize( IISDeserialize& de )
+OutputPlugSignalFormatCmd::deserialize( Util::IISDeserialize& de )
 {
     bool result=true;
@@ -110,5 +110,5 @@
 
 bool
-InputPlugSignalFormatCmd::serialize( IOSSerialize& se )
+InputPlugSignalFormatCmd::serialize( Util::IOSSerialize& se )
 {
     bool result=true;
@@ -131,5 +131,5 @@
 
 bool
-InputPlugSignalFormatCmd::deserialize( IISDeserialize& de )
+InputPlugSignalFormatCmd::deserialize( Util::IISDeserialize& de )
 {
     bool result=true;
Index: trunk/libffado/src/libavc/general/avc_plug_info.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_plug_info.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_plug_info.h (revision 618)
@@ -53,6 +53,6 @@
     virtual ~PlugInfoCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual void clear();
Index: trunk/libffado/src/libavc/general/avc_extended_subunit_info.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_subunit_info.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_extended_subunit_info.h (revision 618)
@@ -47,6 +47,6 @@
     virtual ~ExtendedSubunitInfoPageData();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
     virtual ExtendedSubunitInfoPageData* clone() const;
 
@@ -97,6 +97,6 @@
     virtual ~ExtendedSubunitInfoCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_connect.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_connect.cpp (revision 524)
+++ trunk/libffado/src/libavc/general/avc_connect.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_connect.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -43,5 +43,5 @@
 
 bool
-ConnectCmd::serialize( IOSSerialize& se )
+ConnectCmd::serialize( Util::IOSSerialize& se )
 {
     bool result=true;
@@ -51,5 +51,5 @@
 
 bool
-ConnectCmd::deserialize( IISDeserialize& de )
+ConnectCmd::deserialize( Util::IISDeserialize& de )
 {
     bool result=true;
Index: trunk/libffado/src/libavc/general/avc_subunit.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_subunit.cpp (revision 560)
+++ trunk/libffado/src/libavc/general/avc_subunit.cpp (revision 618)
@@ -32,5 +32,5 @@
 #include "../general/avc_plug_info.h"
 #include "../streamformat/avc_extended_stream_format.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 
 #include <sstream>
Index: trunk/libffado/src/libavc/general/avc_signal_format.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_signal_format.h (revision 524)
+++ trunk/libffado/src/libavc/general/avc_signal_format.h (revision 618)
@@ -38,6 +38,6 @@
     virtual ~OutputPlugSignalFormatCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
@@ -57,6 +57,6 @@
     virtual ~InputPlugSignalFormatCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_unit_info.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_unit_info.cpp (revision 503)
+++ trunk/libffado/src/libavc/general/avc_unit_info.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_unit_info.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -48,5 +48,5 @@
 
 bool
-UnitInfoCmd::serialize( IOSSerialize& se )
+UnitInfoCmd::serialize( Util::IOSSerialize& se )
 {
     AVCCommand::serialize( se );
@@ -66,5 +66,5 @@
 
 bool
-UnitInfoCmd::deserialize( IISDeserialize& de )
+UnitInfoCmd::deserialize( Util::IISDeserialize& de )
 {
     AVCCommand::deserialize( de );
Index: trunk/libffado/src/libavc/general/avc_connect.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_connect.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_connect.h (revision 618)
@@ -36,6 +36,6 @@
     virtual ~ConnectCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_unit_info.h
===================================================================
--- trunk/libffado/src/libavc/general/avc_unit_info.h (revision 503)
+++ trunk/libffado/src/libavc/general/avc_unit_info.h (revision 618)
@@ -58,6 +58,6 @@
     virtual ~UnitInfoCmd();
 
-    virtual bool serialize( IOSSerialize& se );
-    virtual bool deserialize( IISDeserialize& de );
+    virtual bool serialize( Util::IOSSerialize& se );
+    virtual bool deserialize( Util::IISDeserialize& de );
 
     virtual const char* getCmdName() const
Index: trunk/libffado/src/libavc/general/avc_extended_plug_info.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_extended_plug_info.cpp (revision 505)
+++ trunk/libffado/src/libavc/general/avc_extended_plug_info.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_extended_plug_info.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -47,5 +47,5 @@
 
 bool
-ExtendedPlugInfoPlugTypeSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugTypeSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_plugType, "ExtendedPlugInfoPlugTypeSpecificData plugType" );
@@ -55,5 +55,5 @@
 
 bool
-ExtendedPlugInfoPlugTypeSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugTypeSpecificData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_plugType );
@@ -99,5 +99,5 @@
 
 bool
-ExtendedPlugInfoPlugNameSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugNameSpecificData::serialize( Util::IOSSerialize& se )
 {
     byte_t length = strlen( m_name.c_str() );
@@ -113,5 +113,5 @@
 
 bool
-ExtendedPlugInfoPlugNameSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugNameSpecificData::deserialize( Util::IISDeserialize& de )
 {
     byte_t length;
@@ -146,5 +146,5 @@
 
 bool
-ExtendedPlugInfoPlugNumberOfChannelsSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_nrOfChannels,
@@ -155,5 +155,5 @@
 
 bool
-ExtendedPlugInfoPlugNumberOfChannelsSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugNumberOfChannelsSpecificData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_nrOfChannels );
@@ -181,5 +181,5 @@
 
 bool
-ExtendedPlugInfoPlugChannelPositionSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugChannelPositionSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_nrOfClusters,
@@ -215,5 +215,5 @@
 
 bool
-ExtendedPlugInfoPlugChannelPositionSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugChannelPositionSpecificData::deserialize( Util::IISDeserialize& de )
 {
     m_clusterInfos.clear();
@@ -255,5 +255,5 @@
 
 bool
-ExtendedPlugInfoPlugChannelNameSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugChannelNameSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_streamPosition,
@@ -270,5 +270,5 @@
 
 bool
-ExtendedPlugInfoPlugChannelNameSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugChannelNameSpecificData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_streamPosition );
@@ -324,5 +324,5 @@
 
 bool
-ExtendedPlugInfoPlugInputSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugInputSpecificData::serialize( Util::IOSSerialize& se )
 {
     if ( m_plugAddress ) {
@@ -334,5 +334,5 @@
 
 bool
-ExtendedPlugInfoPlugInputSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugInputSpecificData::deserialize( Util::IISDeserialize& de )
 {
     return m_plugAddress->deserialize( de );
@@ -379,5 +379,5 @@
 
 bool
-ExtendedPlugInfoPlugOutputSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoPlugOutputSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_nrOfOutputPlugs, "ExtendedPlugInfoPlugOutputSpecificData: number of output plugs" );
@@ -393,5 +393,5 @@
 
 bool
-ExtendedPlugInfoPlugOutputSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoPlugOutputSpecificData::deserialize( Util::IISDeserialize& de )
 {
     de.read( &m_nrOfOutputPlugs );
@@ -436,5 +436,5 @@
 
 bool
-ExtendedPlugInfoClusterInfoSpecificData::serialize( IOSSerialize& se )
+ExtendedPlugInfoClusterInfoSpecificData::serialize( Util::IOSSerialize& se )
 {
     se.write( m_clusterIndex,
@@ -453,5 +453,5 @@
 
 bool
-ExtendedPlugInfoClusterInfoSpecificData::deserialize( IISDeserialize& de )
+ExtendedPlugInfoClusterInfoSpecificData::deserialize( Util::IISDeserialize& de )
 {
 
@@ -623,7 +623,7 @@
 
 bool
-ExtendedPlugInfoInfoType::serialize( IOSSerialize& se )
-{
-    // XXX \todo improve IOSSerialize::write interface
+ExtendedPlugInfoInfoType::serialize( Util::IOSSerialize& se )
+{
+    // XXX \todo improve Util::IOSSerialize::write interface
     char* buf;
     asprintf( &buf, "ExtendedPlugInfoInfoType infoType (%s)",
@@ -682,5 +682,5 @@
 
 bool
-ExtendedPlugInfoInfoType::deserialize( IISDeserialize& de )
+ExtendedPlugInfoInfoType::deserialize( Util::IISDeserialize& de )
 {
     bool status = false;
@@ -812,5 +812,5 @@
 
 bool
-ExtendedPlugInfoCmd::serialize( IOSSerialize& se )
+ExtendedPlugInfoCmd::serialize( Util::IOSSerialize& se )
 {
     bool status = false;
@@ -824,5 +824,5 @@
 
 bool
-ExtendedPlugInfoCmd::deserialize( IISDeserialize& de )
+ExtendedPlugInfoCmd::deserialize( Util::IISDeserialize& de )
 {
     bool status = false;
Index: trunk/libffado/src/libavc/general/avc_subunit_info.cpp
===================================================================
--- trunk/libffado/src/libavc/general/avc_subunit_info.cpp (revision 505)
+++ trunk/libffado/src/libavc/general/avc_subunit_info.cpp (revision 618)
@@ -23,5 +23,5 @@
 
 #include "avc_subunit_info.h"
-#include "../util/avc_serialize.h"
+#include "libutil/cmd_serialize.h"
 #include "libieee1394/ieee1394service.h"
 
@@ -59,5 +59,5 @@
 
 bool
-SubUnitInfoCmd::serialize( IOSSerialize& se )
+SubUnitInfoCmd::serialize( Util::IOSSerialize& se )
 {
     AVCCommand::serialize( se );
@@ -77,5 +77,5 @@
 
 bool
-SubUnitInfoCmd::deserialize( IISDeserialize& de )
+SubUnitInfoCmd::deserialize( Util::IISDeserialize& de )
 {
     AVCCommand::deserialize( de );