diff --git a/Start.st b/Start.st
index 6b71751..d194be2 100644
--- a/Start.st
+++ b/Start.st
@@ -1,3 +1,5 @@
+PackageLoader fileInPackage: 'OsmoSIP'.
+
 Eval [
     FileStream
         fileIn: 'src/Logging.st';
@@ -6,16 +8,19 @@ Eval [
         fileIn: 'src/BSCConfig.st';
         fileIn: 'src/BSCListener.st';
         fileIn: 'src/BSCSCCPHandler.st';
-        fileIn: 'src/GSMAuthenticator.st';
+        fileIn: 'src/auth/GSMAuthenticatorBase.st';
+        fileIn: 'src/auth/GSMIdentityAuthenticator.st';
+        fileIn: 'src/auth/GSMNullAuthenticator.st';
         fileIn: 'src/GSMProcessor.st';
-        fileIn: 'src/GSMMOCall.st';
+        fileIn: 'src/call/Extensions.st';
+        fileIn: 'src/call/GSMMOCall.st';
+        fileIn: 'src/call/SIPMTCall.st';
         fileIn: 'src/GSMLURequest.st';
         fileIn: 'src/GSMCMServiceRequest.st';
         fileIn: 'src/GSMEmergencySetup.st';
         fileIn: 'src/BSCIPAConnection.st';
         fileIn: 'src/PagingManager.st';
-        fileIn: 'src/MSC.st';
-        fileIn: 'src/SIPCall.st'.
+        fileIn: 'src/MSC.st'.
 
 "
 "