Huge internal restructuring of the in sub-directories

Makefile

@@ -19,6 +19,29 @@ CONVERT_RULES = -r'Osmo.LogManager->LogManager' \
 # Can not be parsed right now..
 #		-r'(``@object => ``@args1)->(``@object ==> ``@args1)'
 
+CORE = \
+	core/Extensions.st core/MessageStructure.st core/MessageBuffer.st \
+	core/LogAreas.st core/TLV.st core/TLVTests.st
+
+IPA = \
+	ipa/IPAConstants.st ipa/IPADispatcher.st ipa/IPAMuxer.st \
+	ipa/IPAProtoHandler.st ipa/IPAMsg.st \
+
+SCCP = sccp/SCCP.st
+
+ISUP = \
+	isup/ISUP.st isup/isup_generated.st isup/ISUPExtensions.st \
+	isup/ISUPTests.st
+
+UA = \
+	ua/M2UA.st
+
+OSMO = \
+	osmo/OsmoUDPSocket.st osmo/OsmoCtrlLogging.st \
+	osmo/OsmoCtrlGrammar.st osmo/OsmoAppConnection.st \
+	osmo/OsmoCtrlGrammarTest.st
+	
+
 
 
 all:
@@ -26,12 +49,8 @@ all:
 
 convert:
 	$(GST_CONVERT) $(CONVERT_RULES) -F squeak -f gst \
-		-o fileout.st compat_for_pharo.st Extensions.st MessageStructure.st \
-		ISUP.st isup_generated.st ISUPExtensions.st IPAConstants.st IPADispatcher.st \
-		IPAMuxer.st IPAProtoHandler.st IPAMsg.st MessageBuffer.st SCCP.st \
-		LogAreas.st M2UA.st SocketBase.st TLV.st OsmoCtrlLogging.st \
-		OsmoCtrlGrammar.st OsmoAppConnection.st \
-		Tests.st ISUPTests.st IPATests.st TLVTests.st OsmoCtrlGrammarTest.st \
-		changes_for_pharo.st
+		-o fileout.st pharo-porting/compat_for_pharo.st \
+		$(CORE) $(IPA) $(SCCP) $(ISUP) $(UA) $(OSMO) \
+		Tests.st pharo-porting/changes_for_pharo.st
 	sed -i s,"=>","==>",g fileout.st
 

package.xml

@@ -7,26 +7,26 @@
     <prereq>PetitParser</prereq>
     <prereq>Sockets</prereq>
 
-    <filein>Extensions.st</filein>
-    <filein>MessageStructure.st</filein>
-    <filein>ISUP.st</filein>
-    <filein>isup_generated.st</filein>
-    <filein>ISUPExtensions.st</filein>
-    <filein>IPAConstants.st</filein>
-    <filein>IPAConstantsGST.st</filein>
-    <filein>IPADispatcher.st</filein>
-    <filein>IPAMuxer.st</filein>
-    <filein>IPAProtoHandler.st</filein>
-    <filein>IPAMsg.st</filein>
-    <filein>MessageBuffer.st</filein>
-    <filein>SCCP.st</filein>
-    <filein>M2UA.st</filein>
-    <filein>LogAreas.st</filein>
-    <filein>SocketBase.st</filein>
-    <filein>TLV.st</filein>
-    <filein>OsmoCtrlLogging.st</filein>
-    <filein>OsmoCtrlGrammar.st</filein>
-    <filein>OsmoAppConnection.st</filein>
+    <filein>core/Extensions.st</filein>
+    <filein>core/MessageStructure.st</filein>
+    <filein>core/MessageBuffer.st</filein>
+    <filein>core/LogAreas.st</filein>
+    <filein>core/TLV.st</filein>
+    <filein>isup/ISUP.st</filein>
+    <filein>isup/isup_generated.st</filein>
+    <filein>isup/ISUPExtensions.st</filein>
+    <filein>ipa/IPAConstants.st</filein>
+    <filein>ipa/IPAConstantsGST.st</filein>
+    <filein>ipa/IPADispatcher.st</filein>
+    <filein>ipa/IPAMuxer.st</filein>
+    <filein>ipa/IPAProtoHandler.st</filein>
+    <filein>ipa/IPAMsg.st</filein>
+    <filein>sccp/SCCP.st</filein>
+    <filein>ua/M2UA.st</filein>
+    <filein>osmo/OsmoUDPSocket.st</filein>
+    <filein>osmo/OsmoCtrlLogging.st</filein>
+    <filein>osmo/OsmoCtrlGrammar.st</filein>
+    <filein>osmo/OsmoAppConnection.st</filein>
 
 
     <test>
@@ -43,9 +43,9 @@
         <sunit>Osmo.CtrlGrammarTest</sunit>
         <sunit>Osmo.CtrlParserTest</sunit>
         <filein>Tests.st</filein>
-        <filein>ISUPTests.st</filein>
-        <filein>IPATests.st</filein>
-        <filein>TLVTests.st</filein>
-        <filein>OsmoCtrlGrammarTest.st</filein>
+        <filein>core/TLVTests.st</filein>
+        <filein>isup/ISUPTests.st</filein>
+        <filein>ipa/IPATests.st</filein>
+        <filein>osmo/OsmoCtrlGrammarTest.st</filein>
     </test>
 </package>