diff --git a/cbc/gen_links.sh b/cbc/gen_links.sh
index 075be2f46..8b886051b 100755
--- a/cbc/gen_links.sh
+++ b/cbc/gen_links.sh
@@ -31,6 +31,7 @@ gen_links $DIR $FILES
 
 DIR=../library/sabp
 FILES="SABP_CommonDataTypes.asn SABP_Constants.asn SABP_Containers.asn SABP_IEs.asn SABP_PDU_Contents.asn SABP_PDU_Descriptions.asn SABP_Types.ttcn SABP_EncDec.cc SABP_Templates.ttcn "
+FILES+="SABP_CodecPort.ttcn SABP_CodecPort_CtrlFunct.ttcn SABP_CodecPort_CtrlFunctDef.cc SABP_Adapter.ttcn "
 gen_links $DIR $FILES
 
 DIR=$BASEDIR/titan.TestPorts.Common_Components.Abstract_Socket/src
@@ -51,7 +52,6 @@ FILES+="HTTP_Adapter.ttcn "
 FILES+="BSSMAP_Templates.ttcn "
 FILES+="CBSP_Types.ttcn CBSP_Templates.ttcn "
 FILES+="CBSP_CodecPort.ttcn CBSP_CodecPort_CtrlFunct.ttcn CBSP_CodecPort_CtrlFunctdef.cc CBSP_Adapter.ttcn "
-FILES+="SABP_CodecPort.ttcn SABP_CodecPort_CtrlFunct.ttcn SABP_CodecPort_CtrlFunctDef.cc SABP_Adapter.ttcn "
 gen_links $DIR $FILES
 
 ignore_pp_results
diff --git a/library/SABP_Adapter.ttcn b/library/sabp/SABP_Adapter.ttcn
similarity index 100%
rename from library/SABP_Adapter.ttcn
rename to library/sabp/SABP_Adapter.ttcn
diff --git a/library/SABP_CodecPort.ttcn b/library/sabp/SABP_CodecPort.ttcn
similarity index 100%
rename from library/SABP_CodecPort.ttcn
rename to library/sabp/SABP_CodecPort.ttcn
diff --git a/library/SABP_CodecPort_CtrlFunct.ttcn b/library/sabp/SABP_CodecPort_CtrlFunct.ttcn
similarity index 100%
rename from library/SABP_CodecPort_CtrlFunct.ttcn
rename to library/sabp/SABP_CodecPort_CtrlFunct.ttcn
diff --git a/library/SABP_CodecPort_CtrlFunctDef.cc b/library/sabp/SABP_CodecPort_CtrlFunctDef.cc
similarity index 100%
rename from library/SABP_CodecPort_CtrlFunctDef.cc
rename to library/sabp/SABP_CodecPort_CtrlFunctDef.cc