diff --git a/UPGRADE.md b/UPGRADE.md
index b6170d04e..c27bd5d58 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -10,11 +10,14 @@
 
     [MOVE] /app/config -> /config
     [MOVE] /app/storage -> /storage
-    [CREATE] /storage/framework
     [DELETE] /bootstrap/start.php
     [DELETE] /bootstrap/autoload.php
+    [DELETE] /artisan
     [SPAWN] /bootstrap/app.php
     [SPAWN] /bootstrap/autoload.php
+    [SPAWN] /artisan
+    [SPAWN] /storage/cms/*.*
+    [SPAWN] /storage/framework/*.*
 
 *SPAWN* means to create a file using the git source.
 
diff --git a/modules/backend/controllers/accesslogs/config_list.yaml b/modules/backend/controllers/accesslogs/config_list.yaml
index c2bf1dcc4..5d12e4988 100644
--- a/modules/backend/controllers/accesslogs/config_list.yaml
+++ b/modules/backend/controllers/accesslogs/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: backend::lang.access_log.menu_label
-list: @/modules/backend/models/accesslog/columns.yaml
+list: ~/modules/backend/models/accesslog/columns.yaml
 modelClass: Backend\Models\AccessLog
 noRecordsMessage: backend::lang.list.no_records
 recordsPerPage: 30
diff --git a/modules/backend/controllers/editorpreferences/config_form.yaml b/modules/backend/controllers/editorpreferences/config_form.yaml
index e0aa539ca..192d0f093 100644
--- a/modules/backend/controllers/editorpreferences/config_form.yaml
+++ b/modules/backend/controllers/editorpreferences/config_form.yaml
@@ -2,6 +2,6 @@
 #  Form Behavior Config
 # ===================================
 
-form: @/modules/backend/models/editorpreferences/fields.yaml
+form: ~/modules/backend/models/editorpreferences/fields.yaml
 modelClass: Backend\Models\EditorPreferences
 defaultRedirect: system/mailtemplates
diff --git a/modules/backend/controllers/usergroups/config_form.yaml b/modules/backend/controllers/usergroups/config_form.yaml
index 27aff7a29..9d204580a 100644
--- a/modules/backend/controllers/usergroups/config_form.yaml
+++ b/modules/backend/controllers/usergroups/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 name: backend::lang.user.group.name
-form: @/modules/backend/models/usergroup/fields.yaml
+form: ~/modules/backend/models/usergroup/fields.yaml
 modelClass: Backend\Models\UserGroup
 defaultRedirect: backend/usergroups
 
diff --git a/modules/backend/controllers/usergroups/config_list.yaml b/modules/backend/controllers/usergroups/config_list.yaml
index 862e61200..193a1d3e2 100644
--- a/modules/backend/controllers/usergroups/config_list.yaml
+++ b/modules/backend/controllers/usergroups/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: backend::lang.user.group.list_title
-list: @/modules/backend/models/usergroup/columns.yaml
+list: ~/modules/backend/models/usergroup/columns.yaml
 modelClass: Backend\Models\UserGroup
 recordUrl: backend/usergroups/update/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/backend/controllers/users/config_form.yaml b/modules/backend/controllers/users/config_form.yaml
index 2787304ca..cb83a00e9 100644
--- a/modules/backend/controllers/users/config_form.yaml
+++ b/modules/backend/controllers/users/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 name: backend::lang.user.name
-form: @/modules/backend/models/user/fields.yaml
+form: ~/modules/backend/models/user/fields.yaml
 modelClass: Backend\Models\User
 defaultRedirect: backend/users
 
diff --git a/modules/backend/controllers/users/config_list.yaml b/modules/backend/controllers/users/config_list.yaml
index d2e35a805..d663fbc94 100644
--- a/modules/backend/controllers/users/config_list.yaml
+++ b/modules/backend/controllers/users/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: backend::lang.user.list_title
-list: @/modules/backend/models/user/columns.yaml
+list: ~/modules/backend/models/user/columns.yaml
 modelClass: Backend\Models\User
 recordUrl: backend/users/update/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index ca8de5f7c..af7e17f52 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -11,7 +11,7 @@ use SystemException;
  *    user:
  *        label: User
  *        type: recordfinder
- *        list: @/plugins/rainlab/user/models/user/columns.yaml
+ *        list: ~/plugins/rainlab/user/models/user/columns.yaml
  *        prompt: Click the Find button to find a user
  *        nameFrom: name
  *        descriptionFrom: email
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index 5ed8392b5..104fa565d 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -391,11 +391,11 @@ class Index extends Controller
     protected function makeTemplateFormWidget($type, $template)
     {
         $formConfigs = [
-            'page'    => '@/modules/cms/classes/page/fields.yaml',
-            'partial' => '@/modules/cms/classes/partial/fields.yaml',
-            'layout'  => '@/modules/cms/classes/layout/fields.yaml',
-            'content' => '@/modules/cms/classes/content/fields.yaml',
-            'asset'   => '@/modules/cms/classes/asset/fields.yaml',
+            'page'    => '~/modules/cms/classes/page/fields.yaml',
+            'partial' => '~/modules/cms/classes/partial/fields.yaml',
+            'layout'  => '~/modules/cms/classes/layout/fields.yaml',
+            'content' => '~/modules/cms/classes/content/fields.yaml',
+            'asset'   => '~/modules/cms/classes/asset/fields.yaml',
         ];
 
         if (!array_key_exists($type, $formConfigs)) {
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index ea3cd6e8c..a142d410d 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -318,7 +318,7 @@ class ServiceProvider extends ModuleServiceProvider
         BackendMenu::registerContextSidenavPartial(
             'October.System',
             'system',
-            '@/modules/system/partials/_system_sidebar.htm'
+            '~/modules/system/partials/_system_sidebar.htm'
         );
     }
 
diff --git a/modules/system/controllers/eventlogs/config_form.yaml b/modules/system/controllers/eventlogs/config_form.yaml
index 466e9b063..88873b5f3 100644
--- a/modules/system/controllers/eventlogs/config_form.yaml
+++ b/modules/system/controllers/eventlogs/config_form.yaml
@@ -6,7 +6,7 @@
 name: Log
 
 # Model Form Field configuration
-form: @/modules/system/models/eventlog/fields.yaml
+form: ~/modules/system/models/eventlog/fields.yaml
 
 # Model Class name
 modelClass: System\Models\EventLog
diff --git a/modules/system/controllers/eventlogs/config_list.yaml b/modules/system/controllers/eventlogs/config_list.yaml
index 58071b0fe..04b69f3de 100644
--- a/modules/system/controllers/eventlogs/config_list.yaml
+++ b/modules/system/controllers/eventlogs/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: system::lang.event_log.menu_label
-list: @/modules/system/models/eventlog/columns.yaml
+list: ~/modules/system/models/eventlog/columns.yaml
 modelClass: System\Models\EventLog
 recordUrl: system/eventlogs/preview/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/system/controllers/maillayouts/config_form.yaml b/modules/system/controllers/maillayouts/config_form.yaml
index 28fcc9273..b1ce1067d 100644
--- a/modules/system/controllers/maillayouts/config_form.yaml
+++ b/modules/system/controllers/maillayouts/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 name: system::lang.mail_templates.layout
-form: @/modules/system/models/maillayout/fields.yaml
+form: ~/modules/system/models/maillayout/fields.yaml
 modelClass: System\Models\MailLayout
 defaultRedirect: system/mailtemplates
 
diff --git a/modules/system/controllers/mailtemplates/config_form.yaml b/modules/system/controllers/mailtemplates/config_form.yaml
index c131d8955..25b2ccd86 100644
--- a/modules/system/controllers/mailtemplates/config_form.yaml
+++ b/modules/system/controllers/mailtemplates/config_form.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 name: system::lang.mail_templates.template
-form: @/modules/system/models/mailtemplate/fields.yaml
+form: ~/modules/system/models/mailtemplate/fields.yaml
 modelClass: System\Models\MailTemplate
 defaultRedirect: system/mailtemplates
 
diff --git a/modules/system/controllers/mailtemplates/config_layouts_list.yaml b/modules/system/controllers/mailtemplates/config_layouts_list.yaml
index 49d93e0ae..b4bb0776e 100644
--- a/modules/system/controllers/mailtemplates/config_layouts_list.yaml
+++ b/modules/system/controllers/mailtemplates/config_layouts_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: system::lang.mail_templates.menu_label
-list: @/modules/system/models/maillayout/columns.yaml
+list: ~/modules/system/models/maillayout/columns.yaml
 modelClass: System\Models\MailLayout
 recordUrl: system/maillayouts/update/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/system/controllers/mailtemplates/config_templates_list.yaml b/modules/system/controllers/mailtemplates/config_templates_list.yaml
index caf0fb569..7e18b60fa 100644
--- a/modules/system/controllers/mailtemplates/config_templates_list.yaml
+++ b/modules/system/controllers/mailtemplates/config_templates_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: system::lang.mail_templates.menu_label
-list: @/modules/system/models/mailtemplate/columns.yaml
+list: ~/modules/system/models/mailtemplate/columns.yaml
 modelClass: System\Models\MailTemplate
 recordUrl: system/mailtemplates/update/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/system/controllers/requestlogs/config_form.yaml b/modules/system/controllers/requestlogs/config_form.yaml
index df72d7376..b17f567f5 100644
--- a/modules/system/controllers/requestlogs/config_form.yaml
+++ b/modules/system/controllers/requestlogs/config_form.yaml
@@ -6,7 +6,7 @@
 name: Log
 
 # Model Form Field configuration
-form: @/modules/system/models/requestlog/fields.yaml
+form: ~/modules/system/models/requestlog/fields.yaml
 
 # Model Class name
 modelClass: System\Models\RequestLog
diff --git a/modules/system/controllers/requestlogs/config_list.yaml b/modules/system/controllers/requestlogs/config_list.yaml
index c1778ad4e..6fbcfefd6 100644
--- a/modules/system/controllers/requestlogs/config_list.yaml
+++ b/modules/system/controllers/requestlogs/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: system::lang.request_log.menu_label
-list: @/modules/system/models/requestlog/columns.yaml
+list: ~/modules/system/models/requestlog/columns.yaml
 modelClass: System\Models\RequestLog
 recordUrl: system/requestlogs/preview/:id
 noRecordsMessage: backend::lang.list.no_records
diff --git a/modules/system/controllers/updates/config_list.yaml b/modules/system/controllers/updates/config_list.yaml
index 016b057e3..02b043b32 100644
--- a/modules/system/controllers/updates/config_list.yaml
+++ b/modules/system/controllers/updates/config_list.yaml
@@ -3,7 +3,7 @@
 # ===================================
 
 title: system::lang.updates.title
-list: @/modules/system/models/pluginversion/columns.yaml
+list: ~/modules/system/models/pluginversion/columns.yaml
 modelClass: System\Models\PluginVersion
 noRecordsMessage: backend::lang.list.no_records
 
diff --git a/modules/system/controllers/updates/config_manage_list.yaml b/modules/system/controllers/updates/config_manage_list.yaml
index e22b85a52..6d417b5bc 100644
--- a/modules/system/controllers/updates/config_manage_list.yaml
+++ b/modules/system/controllers/updates/config_manage_list.yaml
@@ -2,7 +2,7 @@
 #  List Behavior Config
 # ===================================
 
-list: @/modules/system/models/pluginversion/columns.yaml
+list: ~/modules/system/models/pluginversion/columns.yaml
 modelClass: System\Models\PluginVersion
 noRecordsMessage: backend::lang.list.no_records
 showSetup: false
diff --git a/modules/system/partials/_settings_menu.htm b/modules/system/partials/_settings_menu.htm
index 052362086..fe0b6dd31 100644
--- a/modules/system/partials/_settings_menu.htm
+++ b/modules/system/partials/_settings_menu.htm
@@ -3,5 +3,5 @@
     $mySettingItems = System\Classes\SettingsManager::instance()->listItems('mysettings');
 ?>
 
-<?= $this->makePartial('@/modules/system/partials/_settings_menu_items.htm', ['items'=>$mySettingItems]); ?>
-<?= $this->makePartial('@/modules/system/partials/_settings_menu_items.htm', ['items'=>$systemItems]); ?>
\ No newline at end of file
+<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items'=>$mySettingItems]); ?>
+<?= $this->makePartial('~/modules/system/partials/_settings_menu_items.htm', ['items'=>$systemItems]); ?>
\ No newline at end of file
diff --git a/modules/system/partials/_system_sidebar.htm b/modules/system/partials/_system_sidebar.htm
index 8c768c68f..f6aa928c1 100644
--- a/modules/system/partials/_system_sidebar.htm
+++ b/modules/system/partials/_system_sidebar.htm
@@ -3,7 +3,7 @@
 
     <div class="layout">
         <div class="layout-row min-size">
-            <?= $this->makePartial('@/modules/system/partials/_settings_menu_toolbar.htm') ?>
+            <?= $this->makePartial('~/modules/system/partials/_settings_menu_toolbar.htm') ?>
         </div>
 
         <div class="layout-row">
@@ -12,7 +12,7 @@
 
                     <div class="layout-absolute">
                         <div class="control-scrollbar" data-control="scrollbar">
-                            <?= $this->makePartial('@/modules/system/partials/_settings_menu.htm') ?>
+                            <?= $this->makePartial('~/modules/system/partials/_settings_menu.htm') ?>
                         </div>
                     </div>