diff --git a/clients/opal/models/AsyncIP_sl/src/AsyncIP.mk b/clients/opal/models/AsyncIP_sl/s2ss/AsyncIP.mk
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/AsyncIP.mk
rename to clients/opal/models/AsyncIP_sl/s2ss/AsyncIP.mk
diff --git a/clients/opal/models/AsyncIP_sl/src/Interface.h b/clients/opal/models/AsyncIP_sl/s2ss/include/Interface.h
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Interface.h
rename to clients/opal/models/AsyncIP_sl/s2ss/include/Interface.h
diff --git a/clients/opal/models/AsyncIP_sl/src/MsgFormat.h b/clients/opal/models/AsyncIP_sl/s2ss/include/MsgFormat.h
similarity index 88%
rename from clients/opal/models/AsyncIP_sl/src/MsgFormat.h
rename to clients/opal/models/AsyncIP_sl/s2ss/include/MsgFormat.h
index f5fd509be..4e081eb05 100644
--- a/clients/opal/models/AsyncIP_sl/src/MsgFormat.h
+++ b/clients/opal/models/AsyncIP_sl/s2ss/include/MsgFormat.h
@@ -20,6 +20,14 @@
 #define MSG_TYPE_START	1
 #define MSG_TYPE_STOP	2
 
+/** Initialize a message */
+#define MSG_INIT(i)	{ \
+	.version = MSG_VERSION, \
+	.type = MSG_TYPE_DATA, \
+	.length = i, \
+	.sequence = 0 \
+}
+
 /** This message format is used by all clients
  *
  * @diafile msg_format.dia
diff --git a/clients/opal/models/AsyncIP_sl/src/Sched.h b/clients/opal/models/AsyncIP_sl/s2ss/include/Sched.h
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Sched.h
rename to clients/opal/models/AsyncIP_sl/s2ss/include/Sched.h
diff --git a/clients/opal/models/AsyncIP_sl/src/Socket.h b/clients/opal/models/AsyncIP_sl/s2ss/include/Socket.h
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Socket.h
rename to clients/opal/models/AsyncIP_sl/s2ss/include/Socket.h
diff --git a/clients/opal/models/AsyncIP_sl/src/AsyncIP.c b/clients/opal/models/AsyncIP_sl/s2ss/src/AsyncIP.c
similarity index 95%
rename from clients/opal/models/AsyncIP_sl/src/AsyncIP.c
rename to clients/opal/models/AsyncIP_sl/s2ss/src/AsyncIP.c
index 32f64421f..71c2377b3 100644
--- a/clients/opal/models/AsyncIP_sl/src/AsyncIP.c
+++ b/clients/opal/models/AsyncIP_sl/s2ss/src/AsyncIP.c
@@ -66,19 +66,13 @@ static void *SendToIPPort(void *arg)
 	double mdldata[MAXSENDSIZE];
 	int mdldata_size;
 
-	struct msg msg;
+	struct msg msg = MSG_INIT(0);
 	int msg_size;
 
 	OpalPrint("%s: SendToIPPort thread started\n", PROGNAME);
 
 	OpalGetNbAsyncSendIcon(&nbSend);
 	if (nbSend >= 1) {
-
-		/* Prepare message header */
-		msg.version = MSG_VERSION;
-		msg.type = MSG_TYPE_DATA;
-		msg.sequence = 0;
-
 		do {
 			/* This call unblocks when the 'Data Ready' line of a send icon is asserted. */
 			if ((n = OpalWaitForAsyncSendRequest(&SendID)) != EOK) {
diff --git a/clients/opal/models/AsyncIP_sl/src/Interface.c b/clients/opal/models/AsyncIP_sl/s2ss/src/Interface.c
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Interface.c
rename to clients/opal/models/AsyncIP_sl/s2ss/src/Interface.c
diff --git a/clients/opal/models/AsyncIP_sl/src/Sched.c b/clients/opal/models/AsyncIP_sl/s2ss/src/Sched.c
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Sched.c
rename to clients/opal/models/AsyncIP_sl/s2ss/src/Sched.c
diff --git a/clients/opal/models/AsyncIP_sl/src/Socket.c b/clients/opal/models/AsyncIP_sl/s2ss/src/Socket.c
similarity index 100%
rename from clients/opal/models/AsyncIP_sl/src/Socket.c
rename to clients/opal/models/AsyncIP_sl/s2ss/src/Socket.c