diff --git a/.project b/.project
index 41efda7..d7c7acd 100644
--- a/.project
+++ b/.project
@@ -1,3 +1,3 @@
 {
-	'srcDirectory' : 'mc'
-}
\ No newline at end of file
+	'srcDirectory' : 'source'
+}
diff --git a/.smalltalk.ston b/.smalltalk.ston
index b075243..1cce808 100644
--- a/.smalltalk.ston
+++ b/.smalltalk.ston
@@ -2,7 +2,7 @@ SmalltalkCISpec {
   #loading : [
       SCIMetacelloLoadSpec {
           #baseline : 'ShortMessage',
-          #directory : 'mc',
+          #directory : 'source',
           #onConflict : #useLoaded,
           #platforms : [ #pharo ]
       }
diff --git a/mc/.properties b/source/.properties
similarity index 100%
rename from mc/.properties
rename to source/.properties
diff --git a/mc/BaselineOfShortMessage/BaselineOfShortMessage.class.st b/source/BaselineOfShortMessage/BaselineOfShortMessage.class.st
similarity index 100%
rename from mc/BaselineOfShortMessage/BaselineOfShortMessage.class.st
rename to source/BaselineOfShortMessage/BaselineOfShortMessage.class.st
diff --git a/mc/BaselineOfShortMessage/package.st b/source/BaselineOfShortMessage/package.st
similarity index 100%
rename from mc/BaselineOfShortMessage/package.st
rename to source/BaselineOfShortMessage/package.st
diff --git a/mc/ConfigurationOfShortMessage/ConfigurationOfShortMessage.class.st b/source/ConfigurationOfShortMessage/ConfigurationOfShortMessage.class.st
similarity index 100%
rename from mc/ConfigurationOfShortMessage/ConfigurationOfShortMessage.class.st
rename to source/ConfigurationOfShortMessage/ConfigurationOfShortMessage.class.st
diff --git a/mc/ConfigurationOfShortMessage/package.st b/source/ConfigurationOfShortMessage/package.st
similarity index 100%
rename from mc/ConfigurationOfShortMessage/package.st
rename to source/ConfigurationOfShortMessage/package.st
diff --git a/mc/ShortMessage/SMPPDeliverSM.extension.st b/source/ShortMessage/SMPPDeliverSM.extension.st
similarity index 100%
rename from mc/ShortMessage/SMPPDeliverSM.extension.st
rename to source/ShortMessage/SMPPDeliverSM.extension.st
diff --git a/mc/ShortMessage/SMPPSubmitSM.extension.st b/source/ShortMessage/SMPPSubmitSM.extension.st
similarity index 100%
rename from mc/ShortMessage/SMPPSubmitSM.extension.st
rename to source/ShortMessage/SMPPSubmitSM.extension.st
diff --git a/mc/ShortMessage/ShortMessageDataCodingSchemeHelper.class.st b/source/ShortMessage/ShortMessageDataCodingSchemeHelper.class.st
similarity index 100%
rename from mc/ShortMessage/ShortMessageDataCodingSchemeHelper.class.st
rename to source/ShortMessage/ShortMessageDataCodingSchemeHelper.class.st
diff --git a/mc/ShortMessage/ShortMessageDataCodingSchemeHelperTest.class.st b/source/ShortMessage/ShortMessageDataCodingSchemeHelperTest.class.st
similarity index 100%
rename from mc/ShortMessage/ShortMessageDataCodingSchemeHelperTest.class.st
rename to source/ShortMessage/ShortMessageDataCodingSchemeHelperTest.class.st
diff --git a/mc/ShortMessage/ShortMessageTPDUHelper.class.st b/source/ShortMessage/ShortMessageTPDUHelper.class.st
similarity index 100%
rename from mc/ShortMessage/ShortMessageTPDUHelper.class.st
rename to source/ShortMessage/ShortMessageTPDUHelper.class.st
diff --git a/mc/ShortMessage/ShortMessageTPDUHelperTest.class.st b/source/ShortMessage/ShortMessageTPDUHelperTest.class.st
similarity index 100%
rename from mc/ShortMessage/ShortMessageTPDUHelperTest.class.st
rename to source/ShortMessage/ShortMessageTPDUHelperTest.class.st
diff --git a/mc/ShortMessage/package.st b/source/ShortMessage/package.st
similarity index 100%
rename from mc/ShortMessage/package.st
rename to source/ShortMessage/package.st