diff --git a/README.mkdn b/README.mkdn
index c55d6b1..9d13bee 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -8,7 +8,7 @@
 
 Prerequisites
 -------------
-The Ruby variant of crowdin-cli is required for this to work.
+The Ruby variant of crowdin-cli >= 0.5.2 is required for this to work.
 
     \curl -sSL https://get.rvm.io | bash -s stable --ruby
     source /home/your_username/.rvm/scripts/rvm # Add this to your .bashrc file!
diff --git a/crowdin/crowdin_cm-12.1.yaml b/crowdin/crowdin_cm-12.1.yaml
index af0f186..aa33185 100644
--- a/crowdin/crowdin_cm-12.1.yaml
+++ b/crowdin/crowdin_cm-12.1.yaml
@@ -18,6 +18,7 @@
 
 api_key_env: CM_CROWDIN_API_KEY
 base_path_env: CM_CROWDIN_BASE_PATH
+base_path_contains_branch_subfolders: true
 project_identifier: cyanogenmod
 preserve_hierarchy: true
 
@@ -26,7 +27,7 @@
 
   # framework-res
   -
-    source:      '/cm-12.1/frameworks/base/core/res/res/values/cm_strings.xml'
+    source:      '/frameworks/base/core/res/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: &anchor
       android_code:
@@ -120,23 +121,23 @@
 
   # DocumentsUI
   -
-    source:      '/cm-12.1/frameworks/base/packages/DocumentsUI/res/values/cm_strings.xml'
+    source:      '/frameworks/base/packages/DocumentsUI/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Keyguard
   -
-    source:      '/cm-12.1/frameworks/base/packages/Keyguard/res/values/cm_strings.xml'
+    source:      '/frameworks/base/packages/Keyguard/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SystemUI
   -
-    source:      '/cm-12.1/frameworks/base/packages/SystemUI/res/values/cm_arrays.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/frameworks/base/packages/SystemUI/res/values/cm_strings.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -144,271 +145,271 @@
 
   # AudioFX
   -
-    source:      '/cm-12.1/packages/apps/AudioFX/res/values/cm_strings.xml'
+    source:      '/packages/apps/AudioFX/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Bluetooth
   -
-    source:      '/cm-12.1/packages/apps/Bluetooth/res/values/cm_strings.xml'
+    source:      '/packages/apps/Bluetooth/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # BluetoothExt
   -
-    source:      '/cm-12.1/packages/apps/BluetoothExt/res/values/strings.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/BluetoothExt/res/values/strings_dun.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_dun.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/BluetoothExt/res/values/strings_ftp.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_ftp.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/BluetoothExt/res/values/strings_map.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_map.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/BluetoothExt/res/values/strings_sap.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_sap.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calculator
   -
-    source:      '/cm-12.1/packages/apps/Calculator/res/values/cm_strings.xml'
+    source:      '/packages/apps/Calculator/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calendar
   -
-    source:      '/cm-12.1/packages/apps/Calendar/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Calendar/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Calendar/res/values/cm_strings.xml'
+    source:      '/packages/apps/Calendar/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Camera2
   -
-    source:      '/cm-12.1/packages/apps/Camera2/res/values/cm_strings.xml'
+    source:      '/packages/apps/Camera2/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CellBroadcastReceiver
   -
-    source:      '/cm-12.1/packages/apps/CellBroadcastReceiver/res/values/cm_strings.xml'
+    source:      '/packages/apps/CellBroadcastReceiver/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMAccount
   -
-    source:      '/cm-12.1/packages/apps/CMAccount/res/values/strings.xml'
+    source:      '/packages/apps/CMAccount/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMBugReport
   -
-    source:      '/cm-12.1/packages/apps/CMBugReport/res/values/strings.xml'
+    source:      '/packages/apps/CMBugReport/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMFileManager
   -
-    source:      '/cm-12.1/packages/apps/CMFileManager/res/values/plurals.xml'
+    source:      '/packages/apps/CMFileManager/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/CMFileManager/res/values/strings.xml'
+    source:      '/packages/apps/CMFileManager/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMUpdater
   -
-    source:      '/cm-12.1/packages/apps/CMUpdater/res/values/plurals.xml'
+    source:      '/packages/apps/CMUpdater/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/CMUpdater/res/values/strings.xml'
+    source:      '/packages/apps/CMUpdater/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMWallpapers
   -
-    source:      '/cm-12.1/packages/apps/CMWallpapers/res/values/strings.xml'
+    source:      '/packages/apps/CMWallpapers/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Contacts
   -
-    source:      '/cm-12.1/packages/apps/Contacts/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Contacts/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Contacts/res/values/cm_strings.xml'
+    source:      '/packages/apps/Contacts/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsCommon
   -
-    source:      '/cm-12.1/packages/apps/ContactsCommon/res/values/cm_strings.xml'
+    source:      '/packages/apps/ContactsCommon/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DeskClock
   -
-    source:      '/cm-12.1/packages/apps/DeskClock/res/values/cm_strings.xml'
+    source:      '/packages/apps/DeskClock/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Dialer
   -
-    source:      '/cm-12.1/packages/apps/Dialer/res/values/cm_arrays.xml'
+    source:      '/packages/apps/Dialer/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Dialer/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Dialer/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Dialer/res/values/cm_strings.xml'
+    source:      '/packages/apps/Dialer/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Eleven
   -
-    source:      '/cm-12.1/packages/apps/Eleven/res/values/plurals.xml'
+    source:      '/packages/apps/Eleven/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Eleven/res/values/strings.xml'
+    source:      '/packages/apps/Eleven/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Email
   -
-    source:      '/cm-12.1/packages/apps/Email/res/values/cm_strings.xml'
+    source:      '/packages/apps/Email/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Gallery2
   -
-    source:      '/cm-12.1/packages/apps/Gallery2/res/values/cm_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Gallery2/res/values/codeaurora_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/codeaurora_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InCallUI
   -
-    source:      '/cm-12.1/packages/apps/InCallUI/res/values/cm_strings.xml'
+    source:      '/packages/apps/InCallUI/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/InCallUI/res_cm/values/cm_strings.xml'
+    source:      '/packages/apps/InCallUI/res_cm/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # LockClock
   -
-    source:      '/cm-12.1/packages/apps/LockClock/res/values/strings.xml'
+    source:      '/packages/apps/LockClock/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Mms
   -
-    source:      '/cm-12.1/packages/apps/Mms/res/values/cm_arrays.xml'
+    source:      '/packages/apps/Mms/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Mms/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Mms/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Mms/res/values/cm_strings.xml'
+    source:      '/packages/apps/Mms/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhoneCommon
   -
-    source:      '/cm-12.1/packages/apps/PhoneCommon/res/values/cm_strings.xml'
+    source:      '/packages/apps/PhoneCommon/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Profiles
   -
-    source:      '/cm-12.1/packages/apps/Profiles/res/values/strings.xml'
+    source:      '/packages/apps/Profiles/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Settings
   -
-    source:      '/cm-12.1/packages/apps/Settings/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Settings/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Settings/res/values/cm_strings.xml'
+    source:      '/packages/apps/Settings/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SetupWizard
   -
-    source:      '/cm-12.1/packages/apps/SetupWizard/res/values/strings.xml'
+    source:      '/packages/apps/SetupWizard/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SoundRecorder
   -
-    source:      '/cm-12.1/packages/apps/SoundRecorder/res/values/cm_strings.xml'
+    source:      '/packages/apps/SoundRecorder/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Stk
   -
-    source:      '/cm-12.1/packages/apps/Stk/res/values/cm_strings.xml'
+    source:      '/packages/apps/Stk/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Terminal
   -
-    source:      '/cm-12.1/packages/apps/Terminal/res/values/arrays.xml'
+    source:      '/packages/apps/Terminal/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Terminal/res/values/strings.xml'
+    source:      '/packages/apps/Terminal/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeChooser
   -
-    source:      '/cm-12.1/packages/apps/ThemeChooser/res/values/strings.xml'
+    source:      '/packages/apps/ThemeChooser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Trebuchet
   -
-    source:      '/cm-12.1/packages/apps/Trebuchet/res/values/cm_arrays.xml'
+    source:      '/packages/apps/Trebuchet/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Trebuchet/res/values/cm_strings.xml'
+    source:      '/packages/apps/Trebuchet/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TvSettings
   -
-    source:      '/cm-12.1/packages/apps/TvSettings/Settings/res/values/cm_strings.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmail
   -
-    source:      '/cm-12.1/packages/apps/UnifiedEmail/res/values/cm_strings.xml'
+    source:      '/packages/apps/UnifiedEmail/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -416,128 +417,128 @@
 
   # AudioFX
   -
-    source:      '/cm-12.1/packages/cyngn/AudioFX/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/AudioFX/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CalendarNext
   -
-    source:      '/cm-12.1/packages/cyngn/CalendarNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/CalendarNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/CalendarNext/res/values/strings.xml'
+    source:      '/packages/cyngn/CalendarNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CameraNext
   -
-    source:      '/cm-12.1/packages/cyngn/CameraNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/CameraNext/res/values/qcomstrings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/qcomstrings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/CameraNext/res/values/strings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMFota
   -
-    source:      '/cm-12.1/packages/cyngn/CMFota/res/values/strings.xml'
+    source:      '/packages/cyngn/CMFota/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMLogger
   -
-    source:      '/cm-12.1/packages/cyngn/CMLogger/res/values/strings.xml'
+    source:      '/packages/cyngn/CMLogger/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMResolver
   -
-    source:      '/cm-12.1/packages/cyngn/CMResolver/res/values/strings.xml'
+    source:      '/packages/cyngn/CMResolver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CyanogenAccount
   -
-    source:      '/cm-12.1/packages/cyngn/CyanogenAccount/res/values/strings.xml'
+    source:      '/packages/cyngn/CyanogenAccount/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DialerNext
   -
-    source:      '/cm-12.1/packages/cyngn/DialerNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/DialerNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # EmailNext
   -
-    source:      '/cm-12.1/packages/cyngn/EmailNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/EmailNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/EmailNext/res/values/strings.xml'
+    source:      '/packages/cyngn/EmailNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ExchangeNext
   -
-    source:      '/cm-12.1/packages/cyngn/ExchangeNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/ExchangeNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/ExchangeNext/res/values/strings.xml'
+    source:      '/packages/cyngn/ExchangeNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # GalleryNext
   -
-    source:      '/cm-12.1/packages/cyngn/GalleryNext/res/values/strings.xml'
+    source:      '/packages/cyngn/GalleryNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
 
   # InCallUINext
   -
-    source:      '/cm-12.1/packages/cyngn/InCallUINext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/InCallUINext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Screencast
   -
-    source:      '/cm-12.1/packages/cyngn/Screencast/res/values/strings.xml'
+    source:      '/packages/cyngn/Screencast/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeChooser
   -
-    source:      '/cm-12.1/packages/cyngn/ThemeChooser/res/values/strings.xml'
+    source:      '/packages/cyngn/ThemeChooser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeStore
   -
-    source:      '/cm-12.1/packages/cyngn/ThemeStore/res/values/strings.xml'
+    source:      '/packages/cyngn/ThemeStore/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmailNext
   -
-    source:      '/cm-12.1/packages/cyngn/UnifiedEmailNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/UnifiedEmailNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/cyngn/UnifiedEmailNext/res/values/strings.xml'
+    source:      '/packages/cyngn/UnifiedEmailNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # VoiceWakeup
   -
-    source:      '/cm-12.1/packages/cyngn/VoiceWakeup/res/values/strings.xml'
+    source:      '/packages/cyngn/VoiceWakeup/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -545,7 +546,7 @@
 
   # LatinIME
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/cm_strings.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -553,17 +554,17 @@
 
   # DownloadProvider
   -
-    source:      '/cm-12.1/packages/providers/DownloadProvider/res/values/cm_plurals.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/providers/DownloadProvider/res/values/cm_strings.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemesProvider
   -
-    source:      '/cm-12.1/packages/providers/ThemesProvider/res/values/strings.xml'
+    source:      '/packages/providers/ThemesProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -571,19 +572,19 @@
 
   # Mms
   -
-    source:      '/cm-12.1/packages/services/Mms/res/values/cm_strings.xml'
+    source:      '/packages/services/Mms/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telecomm
   -
-    source:      '/cm-12.1/packages/services/Telecomm/res/values/cm_strings.xml'
+    source:      '/packages/services/Telecomm/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telephony
   -
-    source:      '/cm-12.1/packages/services/Telephony/res/values/cm_strings.xml'
+    source:      '/packages/services/Telephony/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -591,23 +592,23 @@
 
   # Galaxy4
   -
-    source:      '/cm-12.1/packages/wallpapers/Galaxy4/res/values/strings.xml'
+    source:      '/packages/wallpapers/Galaxy4/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhaseBeam
   -
-    source:      '/cm-12.1/packages/wallpapers/PhaseBeam/res/values/cm_strings.xml'
+    source:      '/packages/wallpapers/PhaseBeam/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhotoPhase
   -
-    source:      '/cm-12.1/packages/wallpapers/PhotoPhase/res/values/plurals.xml'
+    source:      '/packages/wallpapers/PhotoPhase/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/wallpapers/PhotoPhase/res/values/strings.xml'
+    source:      '/packages/wallpapers/PhotoPhase/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -615,7 +616,7 @@
 
   # WhisperPush
   -
-    source:      '/cm-12.1/external/whispersystems/WhisperPush/res/values/strings.xml'
+    source:      '/external/whispersystems/WhisperPush/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -623,13 +624,13 @@
 
   # CM SDK
   -
-    source:      '/cm-12.1/vendor/cmsdk/cm/res/res/values/strings.xml'
+    source:      '/vendor/cmsdk/cm/res/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMSettingsProvider
   -
-    source:      '/cm-12.1/vendor/cmsdk/packages/CMSettingsProvider/res/values/strings.xml'
+    source:      '/vendor/cmsdk/packages/CMSettingsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -637,93 +638,93 @@
 
   # fmapp2
   -
-    source:      '/cm-12.1/hardware/qcom/fm/fmapp2/res/values/arrays.xml'
+    source:      '/hardware/qcom/fm/fmapp2/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/hardware/qcom/fm/fmapp2/res/values/strings.xml'
+    source:      '/hardware/qcom/fm/fmapp2/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # FMRecord
   -
-    source:      '/cm-12.1/hardware/qcom/fm/FMRecord/res/values/strings.xml'
+    source:      '/hardware/qcom/fm/FMRecord/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SamsungServiceMode
   -
-    source:      '/cm-12.1/packages/apps/SamsungServiceMode/res/values/strings.xml'
+    source:      '/packages/apps/SamsungServiceMode/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # asus tf300t AutoParts
   -
-    source:      '/cm-12.1/device/asus/tf300t/AutoParts/res/values/strings.xml'
+    source:      '/device/asus/tf300t/AutoParts/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # bn acclaim TFF
   -
-    source:      '/cm-12.1/device/bn/acclaim/TFF/res/values/strings.xml'
+    source:      '/device/bn/acclaim/TFF/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola condor doze
   -
-    source:      '/cm-12.1/device/motorola/condor/doze/res/values/strings.xml'
+    source:      '/device/motorola/condor/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola omap4-common doze
   -
-    source:      '/cm-12.1/device/motorola/omap4-common/doze/res/values/strings.xml'
+    source:      '/device/motorola/omap4-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola qcom-common doze
   -
-    source:      '/cm-12.1/device/motorola/qcom-common/doze/res/values/strings.xml'
+    source:      '/device/motorola/qcom-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola quark cmactions
   -
-    source:      '/cm-12.1/device/motorola/quark/cmactions/res/values/strings.xml'
+    source:      '/device/motorola/quark/cmactions/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola victara cmactions
   -
-    source:      '/cm-12.1/device/motorola/victara/cmactions/res/values/strings.xml'
+    source:      '/device/motorola/victara/cmactions/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola xt897 AsantiKeypad
   -
-    source:      '/cm-12.1/device/motorola/xt897/AsantiKeypad/res/values/strings.xml'
+    source:      '/device/motorola/xt897/AsantiKeypad/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # oppo common configpanel
   -
-    source:      '/cm-12.1/device/oppo/common/configpanel/res/values/strings.xml'
+    source:      '/device/oppo/common/configpanel/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # samsung galaxys2-common AdvancedDisplay
   -
-    source:      '/cm-12.1/device/samsung/galaxys2-common/AdvancedDisplay/res/values/arrays.xml'
+    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/device/samsung/galaxys2-common/AdvancedDisplay/res/values/strings.xml'
+    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # samsung qcom-common doze
   -
-    source:      '/cm-12.1/device/samsung/qcom-common/doze/res/values/strings.xml'
+    source:      '/device/samsung/qcom-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -731,6 +732,6 @@
 
   # yu common configpanel
   -
-    source:      '/cm-12.1/device/yu/common/configpanel/res/values/strings.xml'
+    source:      '/device/yu/common/configpanel/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
diff --git a/crowdin/crowdin_cm-12.1_aosp.yaml b/crowdin/crowdin_cm-12.1_aosp.yaml
index 95cfa37..903e5dc 100644
--- a/crowdin/crowdin_cm-12.1_aosp.yaml
+++ b/crowdin/crowdin_cm-12.1_aosp.yaml
@@ -19,6 +19,7 @@
 
 api_key_env: CM_AOSP_CROWDIN_API_KEY
 base_path_env: CM_CROWDIN_BASE_PATH
+base_path_contains_branch_subfolders: true
 project_identifier: cyanogenmod-aosp
 preserve_hierarchy: true
 
@@ -27,7 +28,7 @@
 
   # framework-res
   -
-    source:      '/cm-12.1/frameworks/base/core/res/res/values/strings.xml'
+    source:      '/frameworks/base/core/res/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: &anchor
       android_code:
@@ -43,85 +44,85 @@
 
   # BackupRestoreConfirmation
   -
-    source:      '/cm-12.1/frameworks/base/packages/BackupRestoreConfirmation/res/values/strings.xml'
+    source:      '/frameworks/base/packages/BackupRestoreConfirmation/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CaptivePortalLogin
   -
-    source:      '/cm-12.1/frameworks/base/packages/CaptivePortalLogin/res/values/strings.xml'
+    source:      '/frameworks/base/packages/CaptivePortalLogin/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DefaultContainerService
   -
-    source:      '/cm-12.1/frameworks/base/packages/DefaultContainerService/res/values/strings.xml'
+    source:      '/frameworks/base/packages/DefaultContainerService/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DocumentsUI
   -
-    source:      '/cm-12.1/frameworks/base/packages/DocumentsUI/res/values/strings.xml'
+    source:      '/frameworks/base/packages/DocumentsUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ExternalStorageProvider
   -
-    source:      '/cm-12.1/frameworks/base/packages/ExternalStorageProvider/res/values/strings.xml'
+    source:      '/frameworks/base/packages/ExternalStorageProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # FusedLocation
   -
-    source:      '/cm-12.1/frameworks/base/packages/FusedLocation/res/values/strings.xml'
+    source:      '/frameworks/base/packages/FusedLocation/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InputDevices
   -
-    source:      '/cm-12.1/frameworks/base/packages/InputDevices/res/values/strings.xml'
+    source:      '/frameworks/base/packages/InputDevices/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Keyguard
   -
-    source:      '/cm-12.1/frameworks/base/packages/Keyguard/res/values/strings.xml'
+    source:      '/frameworks/base/packages/Keyguard/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PrintSpooler
   -
-    source:      '/cm-12.1/frameworks/base/packages/PrintSpooler/res/values/strings.xml'
+    source:      '/frameworks/base/packages/PrintSpooler/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SettingsProvider
   -
-    source:      '/cm-12.1/frameworks/base/packages/SettingsProvider/res/values/strings.xml'
+    source:      '/frameworks/base/packages/SettingsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Shell
   -
-    source:      '/cm-12.1/frameworks/base/packages/Shell/res/values/strings.xml'
+    source:      '/frameworks/base/packages/Shell/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SystemUI
   -
-    source:      '/cm-12.1/frameworks/base/packages/SystemUI/res/values/strings.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # VpnDialogs
   -
-    source:      '/cm-12.1/frameworks/base/packages/VpnDialogs/res/values/strings.xml'
+    source:      '/frameworks/base/packages/VpnDialogs/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # WallpaperCropper
   -
-    source:      '/cm-12.1/frameworks/base/packages/WallpaperCropper/res/values/strings.xml'
+    source:      '/frameworks/base/packages/WallpaperCropper/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -129,219 +130,219 @@
 
   # AudioFX
   -
-    source:      '/cm-12.1/packages/apps/AudioFX/res/values/strings.xml'
+    source:      '/packages/apps/AudioFX/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # BasicSmsReceiver
   -
-    source:      '/cm-12.1/packages/apps/BasicSmsReceiver/res/values/strings.xml'
+    source:      '/packages/apps/BasicSmsReceiver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Bluetooth
   -
-    source:      '/cm-12.1/packages/apps/Bluetooth/res/values/strings.xml'
+    source:      '/packages/apps/Bluetooth/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Bluetooth/res/values/strings_pbap.xml'
+    source:      '/packages/apps/Bluetooth/res/values/strings_pbap.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Browser
   -
-    source:      '/cm-12.1/packages/apps/Browser/res/values/strings.xml'
+    source:      '/packages/apps/Browser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calculator
   -
-    source:      '/cm-12.1/packages/apps/Calculator/res/values/strings.xml'
+    source:      '/packages/apps/Calculator/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calendar
   -
-    source:      '/cm-12.1/packages/apps/Calendar/res/values/arrays.xml'
+    source:      '/packages/apps/Calendar/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Calendar/res/values/strings.xml'
+    source:      '/packages/apps/Calendar/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Camera2
   -
-    source:      '/cm-12.1/packages/apps/Camera2/res/values/strings.xml'
+    source:      '/packages/apps/Camera2/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Camera2/res_p/values/strings.xml'
+    source:      '/packages/apps/Camera2/res_p/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CellBroadcastReceiver
   -
-    source:      '/cm-12.1/packages/apps/CellBroadcastReceiver/res/values/strings.xml'
+    source:      '/packages/apps/CellBroadcastReceiver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CertInstaller
   -
-    source:      '/cm-12.1/packages/apps/CertInstaller/res/values/strings.xml'
+    source:      '/packages/apps/CertInstaller/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Contacts
   -
-    source:      '/cm-12.1/packages/apps/Contacts/res/values/strings.xml'
+    source:      '/packages/apps/Contacts/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsCommon
   -
-    source:      '/cm-12.1/packages/apps/ContactsCommon/res/values/strings.xml'
+    source:      '/packages/apps/ContactsCommon/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DeskClock
   -
-    source:      '/cm-12.1/packages/apps/DeskClock/res/values/array.xml'
+    source:      '/packages/apps/DeskClock/res/values/array.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/DeskClock/res/values/strings.xml'
+    source:      '/packages/apps/DeskClock/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Dialer
   -
-    source:      '/cm-12.1/packages/apps/Dialer/res/values/strings.xml'
+    source:      '/packages/apps/Dialer/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Email
   -
-    source:      '/cm-12.1/packages/apps/Email/res/values/strings.xml'
+    source:      '/packages/apps/Email/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Exchange
   -
-    source:      '/cm-12.1/packages/apps/Exchange/res/values/strings.xml'
+    source:      '/packages/apps/Exchange/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # FMRadio
   -
-    source:      '/cm-12.1/packages/apps/FMRadio/res/values/strings.xml'
+    source:      '/packages/apps/FMRadio/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Gallery2
   -
-    source:      '/cm-12.1/packages/apps/Gallery2/res/values/filtershow_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/filtershow_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Gallery2/res/values/strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # HTMLViewer
   -
-    source:      '/cm-12.1/packages/apps/HTMLViewer/res/values/strings.xml'
+    source:      '/packages/apps/HTMLViewer/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InCallUI
   -
-    source:      '/cm-12.1/packages/apps/InCallUI/res/values/strings.xml'
+    source:      '/packages/apps/InCallUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # KeyChain
   -
-    source:      '/cm-12.1/packages/apps/KeyChain/res/values/strings.xml'
+    source:      '/packages/apps/KeyChain/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Mms
   -
-    source:      '/cm-12.1/packages/apps/Mms/res/values/arrays.xml'
+    source:      '/packages/apps/Mms/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Mms/res/values/strings.xml'
+    source:      '/packages/apps/Mms/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Nfc
   -
-    source:      '/cm-12.1/packages/apps/Nfc/res/values/strings.xml'
+    source:      '/packages/apps/Nfc/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PackageInstaller
   -
-    source:      '/cm-12.1/packages/apps/PackageInstaller/res/values/strings.xml'
+    source:      '/packages/apps/PackageInstaller/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhoneCommon
   -
-    source:      '/cm-12.1/packages/apps/PhoneCommon/res/values/strings.xml'
+    source:      '/packages/apps/PhoneCommon/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Settings
   -
-    source:      '/cm-12.1/packages/apps/Settings/res/values/arrays.xml'
+    source:      '/packages/apps/Settings/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/Settings/res/values/strings.xml'
+    source:      '/packages/apps/Settings/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SoundRecorder
   -
-    source:      '/cm-12.1/packages/apps/SoundRecorder/res/values/strings.xml'
+    source:      '/packages/apps/SoundRecorder/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Stk
   -
-    source:      '/cm-12.1/packages/apps/Stk/res/values/strings.xml'
+    source:      '/packages/apps/Stk/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Tag
   -
-    source:      '/cm-12.1/packages/apps/Tag/res/values/strings.xml'
+    source:      '/packages/apps/Tag/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Trebuchet
   -
-    source:      '/cm-12.1/packages/apps/Trebuchet/res/values/strings.xml'
+    source:      '/packages/apps/Trebuchet/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TvSettings
   -
-    source:      '/cm-12.1/packages/apps/TvSettings/Settings/res/values/arrays.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/apps/TvSettings/Settings/res/values/strings.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmail
   -
-    source:      '/cm-12.1/packages/apps/UnifiedEmail/res/values/strings.xml'
+    source:      '/packages/apps/UnifiedEmail/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -349,31 +350,31 @@
 
   # LatinIME
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-action-keys.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-action-keys.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-appname.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-appname.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-config-important-notice.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-config-important-notice.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-emoji-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-emoji-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-letter-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-letter-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings-talkback-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-talkback-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/inputmethods/LatinIME/java/res/values/strings.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -381,41 +382,41 @@
 
   # CalendarProvider
   -
-    source:      '/cm-12.1/packages/providers/CalendarProvider/res/values/strings.xml'
+    source:      '/packages/providers/CalendarProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsProvider
   -
-    source:      '/cm-12.1/packages/providers/ContactsProvider/res/values/strings.xml'
+    source:      '/packages/providers/ContactsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DownloadProvider
   -
-    source:      '/cm-12.1/packages/providers/DownloadProvider/res/values/strings.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/providers/DownloadProvider/ui/res/values/strings.xml'
+    source:      '/packages/providers/DownloadProvider/ui/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # MediaProvider
   -
-    source:      '/cm-12.1/packages/providers/MediaProvider/res/values/strings.xml'
+    source:      '/packages/providers/MediaProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TelephonyProvider
   -
-    source:      '/cm-12.1/packages/providers/TelephonyProvider/res/values/strings.xml'
+    source:      '/packages/providers/TelephonyProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UserDictionaryProvider
   -
-    source:      '/cm-12.1/packages/providers/UserDictionaryProvider/res/values/strings.xml'
+    source:      '/packages/providers/UserDictionaryProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -423,13 +424,13 @@
 
   # Basic
   -
-    source:      '/cm-12.1/packages/screensavers/Basic/res/values/strings.xml'
+    source:      '/packages/screensavers/Basic/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhotoTable
   -
-    source:      '/cm-12.1/packages/screensavers/PhotoTable/res/values/strings.xml'
+    source:      '/packages/screensavers/PhotoTable/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -437,17 +438,17 @@
 
   # Telecomm
   -
-    source:      '/cm-12.1/packages/services/Telecomm/res/values/strings.xml'
+    source:      '/packages/services/Telecomm/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telephony
   -
-    source:      '/cm-12.1/packages/services/Telephony/res/values/strings.xml'
+    source:      '/packages/services/Telephony/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-12.1/packages/services/Telephony/sip/res/values/strings.xml'
+    source:      '/packages/services/Telephony/sip/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -455,42 +456,42 @@
 
   # Basic
   -
-    source:      '/cm-12.1/packages/wallpapers/Basic/res/values/strings.xml'
+    source:      '/packages/wallpapers/Basic/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # HoloSpiral
   -
-    source:      '/cm-12.1/packages/wallpapers/HoloSpiral/res/values/strings.xml'
+    source:      '/packages/wallpapers/HoloSpiral/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # LivePicker
   -
-    source:      '/cm-12.1/packages/wallpapers/LivePicker/res/values/strings.xml'
+    source:      '/packages/wallpapers/LivePicker/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # MagicSmoke
   -
-    source:      '/cm-12.1/packages/wallpapers/MagicSmoke/res/values/strings.xml'
+    source:      '/packages/wallpapers/MagicSmoke/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # MusicVisualization
   -
-    source:      '/cm-12.1/packages/wallpapers/MusicVisualization/res/values/strings.xml'
+    source:      '/packages/wallpapers/MusicVisualization/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # NoiseField
   -
-    source:      '/cm-12.1/packages/wallpapers/NoiseField/res/values/strings.xml'
+    source:      '/packages/wallpapers/NoiseField/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhaseBeam
   -
-    source:      '/cm-12.1/packages/wallpapers/PhaseBeam/res/values/strings.xml'
+    source:      '/packages/wallpapers/PhaseBeam/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
diff --git a/crowdin/crowdin_cm-13.0.yaml b/crowdin/crowdin_cm-13.0.yaml
index 07119df..a3395be 100644
--- a/crowdin/crowdin_cm-13.0.yaml
+++ b/crowdin/crowdin_cm-13.0.yaml
@@ -18,6 +18,7 @@
 
 api_key_env: CM_CROWDIN_API_KEY
 base_path_env: CM_CROWDIN_BASE_PATH
+base_path_contains_branch_subfolders: true
 project_identifier: cyanogenmod
 preserve_hierarchy: true
 
@@ -26,7 +27,7 @@
 
   # framework-res
   -
-    source:      '/cm-13.0/frameworks/base/core/res/res/values/cm_strings.xml'
+    source:      '/frameworks/base/core/res/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: &anchor
       android_code:
@@ -120,17 +121,17 @@
 
   # Keyguard
   -
-    source:      '/cm-13.0/frameworks/base/packages/Keyguard/res/values/cm_strings.xml'
+    source:      '/frameworks/base/packages/Keyguard/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SystemUI
   -
-    source:      '/cm-13.0/frameworks/base/packages/SystemUI/res/values/cm_arrays.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/frameworks/base/packages/SystemUI/res/values/cm_strings.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -138,247 +139,247 @@
 
   # AudioFX
   -
-    source:      '/cm-13.0/packages/apps/AudioFX/res/values/cm_strings.xml'
+    source:      '/packages/apps/AudioFX/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Bluetooth
   -
-    source:      '/cm-13.0/packages/apps/Bluetooth/res/values/cm_strings.xml'
+    source:      '/packages/apps/Bluetooth/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # BluetoothExt
   -
-    source:      '/cm-13.0/packages/apps/BluetoothExt/res/values/strings.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/BluetoothExt/res/values/strings_dun.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_dun.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/BluetoothExt/res/values/strings_ftp.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_ftp.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/BluetoothExt/res/values/strings_map.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_map.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/BluetoothExt/res/values/strings_sap.xml'
+    source:      '/packages/apps/BluetoothExt/res/values/strings_sap.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Browser
   -
-    source:      '/cm-13.0/packages/apps/Browser/res/values/cm_strings.xml'
+    source:      '/packages/apps/Browser/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calendar
   -
-    source:      '/cm-13.0/packages/apps/Calendar/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Calendar/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Calendar/res/values/cm_strings.xml'
+    source:      '/packages/apps/Calendar/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Camera2
   -
-    source:      '/cm-13.0/packages/apps/Camera2/res/values/cm_strings.xml'
+    source:      '/packages/apps/Camera2/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMBugReport
   -
-    source:      '/cm-13.0/packages/apps/CMBugReport/res/values/strings.xml'
+    source:      '/packages/apps/CMBugReport/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMFileManager
   -
-    source:      '/cm-13.0/packages/apps/CMFileManager/res/values/plurals.xml'
+    source:      '/packages/apps/CMFileManager/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/CMFileManager/res/values/strings.xml'
+    source:      '/packages/apps/CMFileManager/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMUpdater
   -
-    source:      '/cm-13.0/packages/apps/CMUpdater/res/values/plurals.xml'
+    source:      '/packages/apps/CMUpdater/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/CMUpdater/res/values/strings.xml'
+    source:      '/packages/apps/CMUpdater/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMWallpapers
   -
-    source:      '/cm-13.0/packages/apps/CMWallpapers/res/values/strings.xml'
+    source:      '/packages/apps/CMWallpapers/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Contacts
   -
-    source:      '/cm-13.0/packages/apps/Contacts/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Contacts/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Contacts/res/values/cm_strings.xml'
+    source:      '/packages/apps/Contacts/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsCommon
   -
-    source:      '/cm-13.0/packages/apps/ContactsCommon/res/values/cm_plurals.xml'
+    source:      '/packages/apps/ContactsCommon/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/ContactsCommon/res/values/cm_strings.xml'
+    source:      '/packages/apps/ContactsCommon/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DeskClock
   #-
-  #  source:      '/cm-13.0/packages/apps/DeskClock/res/values/cm_strings.xml'
+  #  source:      '/packages/apps/DeskClock/res/values/cm_strings.xml'
   #  translation: '/%original_path%-%android_code%/%original_file_name%'
   #  languages_mapping: *anchor
 
   # Dialer
   -
-    source:      '/cm-13.0/packages/apps/Dialer/res/values/cm_strings.xml'
+    source:      '/packages/apps/Dialer/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Eleven
   -
-    source:      '/cm-13.0/packages/apps/Eleven/res/values/plurals.xml'
+    source:      '/packages/apps/Eleven/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Eleven/res/values/strings.xml'
+    source:      '/packages/apps/Eleven/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Email
   -
-    source:      '/cm-13.0/packages/apps/Email/res/values/cm_strings.xml'
+    source:      '/packages/apps/Email/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Gallery2
   -
-    source:      '/cm-13.0/packages/apps/Gallery2/res/values/cm_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Gallery2/res/values/codeaurora_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/codeaurora_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InCallUI
   -
-    source:      '/cm-13.0/packages/apps/InCallUI/res/values/cm_strings.xml'
+    source:      '/packages/apps/InCallUI/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/InCallUI/res/values/qtistrings.xml'
+    source:      '/packages/apps/InCallUI/res/values/qtistrings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # LockClock
   -
-    source:      '/cm-13.0/packages/apps/LockClock/res/values/strings.xml'
+    source:      '/packages/apps/LockClock/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhoneCommon
   -
-    source:      '/cm-13.0/packages/apps/PhoneCommon/res/values/cm_strings.xml'
+    source:      '/packages/apps/PhoneCommon/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Profiles
   -
-    source:      '/cm-13.0/packages/apps/Profiles/res/values/strings.xml'
+    source:      '/packages/apps/Profiles/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Screencast
   -
-    source:      '/cm-13.0/packages/apps/Screencast/res/values/strings.xml'
+    source:      '/packages/apps/Screencast/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Settings
   -
-    source:      '/cm-13.0/packages/apps/Settings/res/values/cm_plurals.xml'
+    source:      '/packages/apps/Settings/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Settings/res/values/cm_strings.xml'
+    source:      '/packages/apps/Settings/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SetupWizard
   -
-    source:      '/cm-13.0/packages/apps/SetupWizard/res/values/strings.xml'
+    source:      '/packages/apps/SetupWizard/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SoundRecorder
   -
-    source:      '/cm-13.0/packages/apps/SoundRecorder/res/values/cm_strings.xml'
+    source:      '/packages/apps/SoundRecorder/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Stk
   -
-    source:      '/cm-13.0/packages/apps/Stk/res/values/cm_strings.xml'
+    source:      '/packages/apps/Stk/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Terminal
   -
-    source:      '/cm-13.0/packages/apps/Terminal/res/values/arrays.xml'
+    source:      '/packages/apps/Terminal/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Terminal/res/values/strings.xml'
+    source:      '/packages/apps/Terminal/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeChooser
   -
-    source:      '/cm-13.0/packages/apps/ThemeChooser/res/values/strings.xml'
+    source:      '/packages/apps/ThemeChooser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Trebuchet
   -
-    source:      '/cm-13.0/packages/apps/Trebuchet/res/values/cm_arrays.xml'
+    source:      '/packages/apps/Trebuchet/res/values/cm_arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Trebuchet/res/values/cm_strings.xml'
+    source:      '/packages/apps/Trebuchet/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TvSettings
   -
-    source:      '/cm-13.0/packages/apps/TvSettings/Settings/res/values/cm_strings.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmail
   -
-    source:      '/cm-13.0/packages/apps/UnifiedEmail/res/values/cm_strings.xml'
+    source:      '/packages/apps/UnifiedEmail/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -386,121 +387,121 @@
 
   # AudioFX
   -
-    source:      '/cm-13.0/packages/cyngn/AudioFX/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/AudioFX/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CalendarNext
   -
-    source:      '/cm-13.0/packages/cyngn/CalendarNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/CalendarNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/CalendarNext/res/values/strings.xml'
+    source:      '/packages/cyngn/CalendarNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CameraNext
   -
-    source:      '/cm-13.0/packages/cyngn/CameraNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/CameraNext/res/values/qcomstrings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/qcomstrings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/CameraNext/res/values/strings.xml'
+    source:      '/packages/cyngn/CameraNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMFota
   -
-    source:      '/cm-13.0/packages/cyngn/CMFota/res/values/strings.xml'
+    source:      '/packages/cyngn/CMFota/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMLogger
   -
-    source:      '/cm-13.0/packages/cyngn/CMLogger/res/values/strings.xml'
+    source:      '/packages/cyngn/CMLogger/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMResolver
   -
-    source:      '/cm-13.0/packages/cyngn/CMResolver/res/values/strings.xml'
+    source:      '/packages/cyngn/CMResolver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CyanogenAccount
   -
-    source:      '/cm-13.0/packages/cyngn/CyanogenAccount/res/values/strings.xml'
+    source:      '/packages/cyngn/CyanogenAccount/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DialerNext
   -
-    source:      '/cm-13.0/packages/cyngn/DialerNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/DialerNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # EmailNext
   -
-    source:      '/cm-13.0/packages/cyngn/EmailNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/EmailNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/EmailNext/res/values/strings.xml'
+    source:      '/packages/cyngn/EmailNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ExchangeNext
   -
-    source:      '/cm-13.0/packages/cyngn/ExchangeNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/ExchangeNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/ExchangeNext/res/values/strings.xml'
+    source:      '/packages/cyngn/ExchangeNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # GalleryNext
   -
-    source:      '/cm-13.0/packages/cyngn/GalleryNext/res/values/strings.xml'
+    source:      '/packages/cyngn/GalleryNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InCallUINext
   -
-    source:      '/cm-13.0/packages/cyngn/InCallUINext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/InCallUINext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeChooser
   -
-    source:      '/cm-13.0/packages/cyngn/ThemeChooser/res/values/strings.xml'
+    source:      '/packages/cyngn/ThemeChooser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemeStore
   -
-    source:      '/cm-13.0/packages/cyngn/ThemeStore/res/values/strings.xml'
+    source:      '/packages/cyngn/ThemeStore/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmailNext
   -
-    source:      '/cm-13.0/packages/cyngn/UnifiedEmailNext/res/values/cm_strings.xml'
+    source:      '/packages/cyngn/UnifiedEmailNext/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/cyngn/UnifiedEmailNext/res/values/strings.xml'
+    source:      '/packages/cyngn/UnifiedEmailNext/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # VoiceWakeup
   -
-    source:      '/cm-13.0/packages/cyngn/VoiceWakeup/res/values/strings.xml'
+    source:      '/packages/cyngn/VoiceWakeup/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -508,7 +509,7 @@
 
   # LatinIME
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/cm_strings.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -516,17 +517,17 @@
 
   # DownloadProvider
   -
-    source:      '/cm-13.0/packages/providers/DownloadProvider/res/values/cm_plurals.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/cm_plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/providers/DownloadProvider/res/values/cm_strings.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ThemesProvider
   -
-    source:      '/cm-13.0/packages/providers/ThemesProvider/res/values/strings.xml'
+    source:      '/packages/providers/ThemesProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -534,23 +535,23 @@
 
   # Mms
   -
-    source:      '/cm-13.0/packages/services/Mms/res/values/cm_strings.xml'
+    source:      '/packages/services/Mms/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telecomm
   -
-    source:      '/cm-13.0/packages/services/Telecomm/res/values/cm_strings.xml'
+    source:      '/packages/services/Telecomm/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telephony
   -
-    source:      '/cm-13.0/packages/services/Telephony/res/values/cm_strings.xml'
+    source:      '/packages/services/Telephony/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/services/Telephony/res/values/qtistrings.xml'
+    source:      '/packages/services/Telephony/res/values/qtistrings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -558,23 +559,23 @@
 
   # Galaxy4
   -
-    source:      '/cm-13.0/packages/wallpapers/Galaxy4/res/values/strings.xml'
+    source:      '/packages/wallpapers/Galaxy4/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhaseBeam
   -
-    source:      '/cm-13.0/packages/wallpapers/PhaseBeam/res/values/cm_strings.xml'
+    source:      '/packages/wallpapers/PhaseBeam/res/values/cm_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhotoPhase
   -
-    source:      '/cm-13.0/packages/wallpapers/PhotoPhase/res/values/plurals.xml'
+    source:      '/packages/wallpapers/PhotoPhase/res/values/plurals.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/wallpapers/PhotoPhase/res/values/strings.xml'
+    source:      '/packages/wallpapers/PhotoPhase/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -582,13 +583,13 @@
 
   # CM SDK
   -
-    source:      '/cm-13.0/vendor/cmsdk/cm/res/res/values/strings.xml'
+    source:      '/vendor/cmsdk/cm/res/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CMSettingsProvider
   -
-    source:      '/cm-13.0/vendor/cmsdk/packages/CMSettingsProvider/res/values/strings.xml'
+    source:      '/vendor/cmsdk/packages/CMSettingsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -596,77 +597,77 @@
 
   # SamsungServiceMode
   -
-    source:      '/cm-13.0/packages/apps/SamsungServiceMode/res/values/strings.xml'
+    source:      '/packages/apps/SamsungServiceMode/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # asus tf300t AutoParts
   -
-    source:      '/cm-13.0/device/asus/tf300t/AutoParts/res/values/strings.xml'
+    source:      '/device/asus/tf300t/AutoParts/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # bn acclaim TFF
   -
-    source:      '/cm-13.0/device/bn/acclaim/TFF/res/values/strings.xml'
+    source:      '/device/bn/acclaim/TFF/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola condor doze
   -
-    source:      '/cm-13.0/device/motorola/condor/doze/res/values/strings.xml'
+    source:      '/device/motorola/condor/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola omap4-common doze
   -
-    source:      '/cm-13.0/device/motorola/omap4-common/doze/res/values/strings.xml'
+    source:      '/device/motorola/omap4-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola qcom-common doze
   -
-    source:      '/cm-13.0/device/motorola/qcom-common/doze/res/values/strings.xml'
+    source:      '/device/motorola/qcom-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola quark cmactions
   -
-    source:      '/cm-13.0/device/motorola/quark/cmactions/res/values/strings.xml'
+    source:      '/device/motorola/quark/cmactions/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola victara cmactions
   -
-    source:      '/cm-13.0/device/motorola/victara/cmactions/res/values/strings.xml'
+    source:      '/device/motorola/victara/cmactions/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # motorola xt897 AsantiKeypad
   -
-    source:      '/cm-13.0/device/motorola/xt897/AsantiKeypad/res/values/strings.xml'
+    source:      '/device/motorola/xt897/AsantiKeypad/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # oppo common configpanel
   -
-    source:      '/cm-13.0/device/oppo/common/configpanel/res/values/strings.xml'
+    source:      '/device/oppo/common/configpanel/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # samsung galaxys2-common AdvancedDisplay
   -
-    source:      '/cm-13.0/device/samsung/galaxys2-common/AdvancedDisplay/res/values/arrays.xml'
+    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/device/samsung/galaxys2-common/AdvancedDisplay/res/values/strings.xml'
+    source:      '/device/samsung/galaxys2-common/AdvancedDisplay/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # samsung qcom-common doze
   -
-    source:      '/cm-13.0/device/samsung/qcom-common/doze/res/values/strings.xml'
+    source:      '/device/samsung/qcom-common/doze/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -674,6 +675,6 @@
 
   # yu common configpanel
   -
-    source:      '/cm-13.0/device/yu/common/configpanel/res/values/strings.xml'
+    source:      '/device/yu/common/configpanel/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
diff --git a/crowdin/crowdin_cm-13.0_aosp.yaml b/crowdin/crowdin_cm-13.0_aosp.yaml
index 1b96603..649f762 100644
--- a/crowdin/crowdin_cm-13.0_aosp.yaml
+++ b/crowdin/crowdin_cm-13.0_aosp.yaml
@@ -19,6 +19,7 @@
 
 api_key_env: CM_AOSP_CROWDIN_API_KEY
 base_path_env: CM_CROWDIN_BASE_PATH
+base_path_contains_branch_subfolders: true
 project_identifier: cyanogenmod-aosp
 preserve_hierarchy: true
 
@@ -27,7 +28,7 @@
 
   # framework-res
   -
-    source:      '/cm-13.0/frameworks/base/core/res/res/values/strings.xml'
+    source:      '/frameworks/base/core/res/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: &anchor
       android_code:
@@ -43,101 +44,101 @@
 
   # BackupRestoreConfirmation
   -
-    source:      '/cm-13.0/frameworks/base/packages/BackupRestoreConfirmation/res/values/strings.xml'
+    source:      '/frameworks/base/packages/BackupRestoreConfirmation/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CaptivePortalLogin
   -
-    source:      '/cm-13.0/frameworks/base/packages/CaptivePortalLogin/res/values/strings.xml'
+    source:      '/frameworks/base/packages/CaptivePortalLogin/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DefaultContainerService
   -
-    source:      '/cm-13.0/frameworks/base/packages/DefaultContainerService/res/values/strings.xml'
+    source:      '/frameworks/base/packages/DefaultContainerService/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DocumentsUI
   -
-    source:      '/cm-13.0/frameworks/base/packages/DocumentsUI/res/values/strings.xml'
+    source:      '/frameworks/base/packages/DocumentsUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ExternalStorageProvider
   -
-    source:      '/cm-13.0/frameworks/base/packages/ExternalStorageProvider/res/values/strings.xml'
+    source:      '/frameworks/base/packages/ExternalStorageProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # FusedLocation
   -
-    source:      '/cm-13.0/frameworks/base/packages/FusedLocation/res/values/strings.xml'
+    source:      '/frameworks/base/packages/FusedLocation/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InputDevices
   -
-    source:      '/cm-13.0/frameworks/base/packages/InputDevices/res/values/strings.xml'
+    source:      '/frameworks/base/packages/InputDevices/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Keyguard
   -
-    source:      '/cm-13.0/frameworks/base/packages/Keyguard/res/values/strings.xml'
+    source:      '/frameworks/base/packages/Keyguard/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PrintSpooler
   -
-    source:      '/cm-13.0/frameworks/base/packages/PrintSpooler/res/values/strings.xml'
+    source:      '/frameworks/base/packages/PrintSpooler/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SettingsLib
   -
-    source:      '/cm-13.0/frameworks/base/packages/SettingsLib/res/values/arrays.xml'
+    source:      '/frameworks/base/packages/SettingsLib/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/frameworks/base/packages/SettingsLib/res/values/strings.xml'
+    source:      '/frameworks/base/packages/SettingsLib/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SettingsProvider
   -
-    source:      '/cm-13.0/frameworks/base/packages/SettingsProvider/res/values/strings.xml'
+    source:      '/frameworks/base/packages/SettingsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Shell
   -
-    source:      '/cm-13.0/frameworks/base/packages/Shell/res/values/strings.xml'
+    source:      '/frameworks/base/packages/Shell/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # StatementService
   -
-    source:      '/cm-13.0/frameworks/base/packages/StatementService/res/values/strings.xml'
+    source:      '/frameworks/base/packages/StatementService/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SystemUI
   -
-    source:      '/cm-13.0/frameworks/base/packages/SystemUI/res/values/strings.xml'
+    source:      '/frameworks/base/packages/SystemUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # VpnDialogs
   -
-    source:      '/cm-13.0/frameworks/base/packages/VpnDialogs/res/values/strings.xml'
+    source:      '/frameworks/base/packages/VpnDialogs/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # WallpaperCropper
   -
-    source:      '/cm-13.0/frameworks/base/packages/WallpaperCropper/res/values/strings.xml'
+    source:      '/frameworks/base/packages/WallpaperCropper/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -145,229 +146,229 @@
 
   # AudioFX
   -
-    source:      '/cm-13.0/packages/apps/AudioFX/res/values/strings.xml'
+    source:      '/packages/apps/AudioFX/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # BasicSmsReceiver
   -
-    source:      '/cm-13.0/packages/apps/BasicSmsReceiver/res/values/strings.xml'
+    source:      '/packages/apps/BasicSmsReceiver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Bluetooth
   -
-    source:      '/cm-13.0/packages/apps/Bluetooth/res/values/strings.xml'
+    source:      '/packages/apps/Bluetooth/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Bluetooth/res/values/strings_pbap.xml'
+    source:      '/packages/apps/Bluetooth/res/values/strings_pbap.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Bluetooth/res/values/strings_sap.xml'
+    source:      '/packages/apps/Bluetooth/res/values/strings_sap.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Browser
   -
-    source:      '/cm-13.0/packages/apps/Browser/res/values/strings.xml'
+    source:      '/packages/apps/Browser/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Calendar
   -
-    source:      '/cm-13.0/packages/apps/Calendar/res/values/arrays.xml'
+    source:      '/packages/apps/Calendar/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Calendar/res/values/strings.xml'
+    source:      '/packages/apps/Calendar/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Camera2
   -
-    source:      '/cm-13.0/packages/apps/Camera2/res/values/strings.xml'
+    source:      '/packages/apps/Camera2/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Camera2/res_p/values/strings.xml'
+    source:      '/packages/apps/Camera2/res_p/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CellBroadcastReceiver
   -
-    source:      '/cm-13.0/packages/apps/CellBroadcastReceiver/res/values/strings.xml'
+    source:      '/packages/apps/CellBroadcastReceiver/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CertInstaller
   -
-    source:      '/cm-13.0/packages/apps/CertInstaller/res/values/strings.xml'
+    source:      '/packages/apps/CertInstaller/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Contacts
   -
-    source:      '/cm-13.0/packages/apps/Contacts/res/values/strings.xml'
+    source:      '/packages/apps/Contacts/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsCommon
   -
-    source:      '/cm-13.0/packages/apps/ContactsCommon/res/values/strings.xml'
+    source:      '/packages/apps/ContactsCommon/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DeskClock
   -
-    source:      '/cm-13.0/packages/apps/DeskClock/res/values/array.xml'
+    source:      '/packages/apps/DeskClock/res/values/array.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/DeskClock/res/values/strings.xml'
+    source:      '/packages/apps/DeskClock/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Dialer
   -
-    source:      '/cm-13.0/packages/apps/Dialer/res/values/strings.xml'
+    source:      '/packages/apps/Dialer/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Email
   -
-    source:      '/cm-13.0/packages/apps/Email/res/values/strings.xml'
+    source:      '/packages/apps/Email/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ExactCalculator
   -
-    source:      '/cm-13.0/packages/apps/ExactCalculator/res/values/strings.xml'
+    source:      '/packages/apps/ExactCalculator/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Exchange
   -
-    source:      '/cm-13.0/packages/apps/Exchange/res/values/strings.xml'
+    source:      '/packages/apps/Exchange/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # FMRadio
   -
-    source:      '/cm-13.0/packages/apps/FMRadio/res/values/strings.xml'
+    source:      '/packages/apps/FMRadio/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Gallery2
   -
-    source:      '/cm-13.0/packages/apps/Gallery2/res/values/filtershow_strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/filtershow_strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Gallery2/res/values/strings.xml'
+    source:      '/packages/apps/Gallery2/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # HTMLViewer
   -
-    source:      '/cm-13.0/packages/apps/HTMLViewer/res/values/strings.xml'
+    source:      '/packages/apps/HTMLViewer/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # InCallUI
   -
-    source:      '/cm-13.0/packages/apps/InCallUI/res/values/strings.xml'
+    source:      '/packages/apps/InCallUI/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # KeyChain
   -
-    source:      '/cm-13.0/packages/apps/KeyChain/res/values/strings.xml'
+    source:      '/packages/apps/KeyChain/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ManagedProvisioning
   -
-    source:      '/cm-13.0/packages/apps/ManagedProvisioning/res/values/strings.xml'
+    source:      '/packages/apps/ManagedProvisioning/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Messaging
   -
-    source:      '/cm-13.0/packages/apps/Messaging/res/values/arrays.xml'
+    source:      '/packages/apps/Messaging/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Messaging/res/values/strings.xml'
+    source:      '/packages/apps/Messaging/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Nfc
   -
-    source:      '/cm-13.0/packages/apps/Nfc/res/values/strings.xml'
+    source:      '/packages/apps/Nfc/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PackageInstaller
   -
-    source:      '/cm-13.0/packages/apps/PackageInstaller/res/values/strings.xml'
+    source:      '/packages/apps/PackageInstaller/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhoneCommon
   -
-    source:      '/cm-13.0/packages/apps/PhoneCommon/res/values/strings.xml'
+    source:      '/packages/apps/PhoneCommon/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Settings
   -
-    source:      '/cm-13.0/packages/apps/Settings/res/values/arrays.xml'
+    source:      '/packages/apps/Settings/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/Settings/res/values/strings.xml'
+    source:      '/packages/apps/Settings/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # SoundRecorder
   -
-    source:      '/cm-13.0/packages/apps/SoundRecorder/res/values/strings.xml'
+    source:      '/packages/apps/SoundRecorder/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Stk
   -
-    source:      '/cm-13.0/packages/apps/Stk/res/values/strings.xml'
+    source:      '/packages/apps/Stk/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Tag
   -
-    source:      '/cm-13.0/packages/apps/Tag/res/values/strings.xml'
+    source:      '/packages/apps/Tag/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Trebuchet
   -
-    source:      '/cm-13.0/packages/apps/Trebuchet/res/values/strings.xml'
+    source:      '/packages/apps/Trebuchet/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TvSettings
   -
-    source:      '/cm-13.0/packages/apps/TvSettings/Settings/res/values/arrays.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/arrays.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/apps/TvSettings/Settings/res/values/strings.xml'
+    source:      '/packages/apps/TvSettings/Settings/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UnifiedEmail
   -
-    source:      '/cm-13.0/packages/apps/UnifiedEmail/res/values/strings.xml'
+    source:      '/packages/apps/UnifiedEmail/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -375,31 +376,31 @@
 
   # LatinIME
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-action-keys.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-action-keys.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-appname.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-appname.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-config-important-notice.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-config-important-notice.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-emoji-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-emoji-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-letter-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-letter-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings-talkback-descriptions.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings-talkback-descriptions.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/inputmethods/LatinIME/java/res/values/strings.xml'
+    source:      '/packages/inputmethods/LatinIME/java/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -407,53 +408,53 @@
 
   # BookmarkProvider
   -
-    source:      '/cm-13.0/packages/providers/BookmarkProvider/res/values/strings.xml'
+    source:      '/packages/providers/BookmarkProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CalendarProvider
   -
-    source:      '/cm-13.0/packages/providers/CalendarProvider/res/values/strings.xml'
+    source:      '/packages/providers/CalendarProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # CallLogProvider
   -
-    source:      '/cm-13.0/packages/providers/CallLogProvider/res/values/strings.xml'
+    source:      '/packages/providers/CallLogProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # ContactsProvider
   -
-    source:      '/cm-13.0/packages/providers/ContactsProvider/res/values/strings.xml'
+    source:      '/packages/providers/ContactsProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # DownloadProvider
   -
-    source:      '/cm-13.0/packages/providers/DownloadProvider/res/values/strings.xml'
+    source:      '/packages/providers/DownloadProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/providers/DownloadProvider/ui/res/values/strings.xml'
+    source:      '/packages/providers/DownloadProvider/ui/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # MediaProvider
   -
-    source:      '/cm-13.0/packages/providers/MediaProvider/res/values/strings.xml'
+    source:      '/packages/providers/MediaProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # TelephonyProvider
   -
-    source:      '/cm-13.0/packages/providers/TelephonyProvider/res/values/strings.xml'
+    source:      '/packages/providers/TelephonyProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # UserDictionaryProvider
   -
-    source:      '/cm-13.0/packages/providers/UserDictionaryProvider/res/values/strings.xml'
+    source:      '/packages/providers/UserDictionaryProvider/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -461,13 +462,13 @@
 
   # Basic
   -
-    source:      '/cm-13.0/packages/screensavers/Basic/res/values/strings.xml'
+    source:      '/packages/screensavers/Basic/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhotoTable
   -
-    source:      '/cm-13.0/packages/screensavers/PhotoTable/res/values/strings.xml'
+    source:      '/packages/screensavers/PhotoTable/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -475,17 +476,17 @@
 
   # Telecomm
   -
-    source:      '/cm-13.0/packages/services/Telecomm/res/values/strings.xml'
+    source:      '/packages/services/Telecomm/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # Telephony
   -
-    source:      '/cm-13.0/packages/services/Telephony/res/values/strings.xml'
+    source:      '/packages/services/Telephony/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
   -
-    source:      '/cm-13.0/packages/services/Telephony/sip/res/values/strings.xml'
+    source:      '/packages/services/Telephony/sip/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
@@ -493,36 +494,36 @@
 
   # Basic
   -
-    source:      '/cm-13.0/packages/wallpapers/Basic/res/values/strings.xml'
+    source:      '/packages/wallpapers/Basic/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # HoloSpiral
   -
-    source:      '/cm-13.0/packages/wallpapers/HoloSpiral/res/values/strings.xml'
+    source:      '/packages/wallpapers/HoloSpiral/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # LivePicker
   -
-    source:      '/cm-13.0/packages/wallpapers/LivePicker/res/values/strings.xml'
+    source:      '/packages/wallpapers/LivePicker/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # MagicSmoke
   -
-    source:      '/cm-13.0/packages/wallpapers/MagicSmoke/res/values/strings.xml'
+    source:      '/packages/wallpapers/MagicSmoke/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # NoiseField
   -
-    source:      '/cm-13.0/packages/wallpapers/NoiseField/res/values/strings.xml'
+    source:      '/packages/wallpapers/NoiseField/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
 
   # PhaseBeam
   -
-    source:      '/cm-13.0/packages/wallpapers/PhaseBeam/res/values/strings.xml'
+    source:      '/packages/wallpapers/PhaseBeam/res/values/strings.xml'
     translation: '/%original_path%-%android_code%/%original_file_name%'
     languages_mapping: *anchor
diff --git a/crowdin_sync.py b/crowdin_sync.py
index ed6a0d9..d09b8a6 100755
--- a/crowdin_sync.py
+++ b/crowdin_sync.py
@@ -164,19 +164,19 @@
         print('\nUploading Crowdin source translations (custom config)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/%s' % (_DIR, config),
-                   'upload', 'sources'])
+                   'upload', 'sources', '--branch=%s' % branch])
     else:
         print('\nUploading Crowdin source translations '
               '(AOSP supported languages)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/crowdin_%s.yaml' % (_DIR, branch),
-                   'upload', 'sources'])
+                   'upload', 'sources', '--branch=%s' % branch])
 
         print('\nUploading Crowdin source translations '
               '(non-AOSP supported languages)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, branch),
-                   'upload', 'sources'])
+                   'upload', 'sources', '--branch=%s' % branch])
 
 
 def download_crowdin(base_path, branch, xml, username, config,
@@ -189,18 +189,18 @@
         print('\nDownloading Crowdin translations (custom config)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/%s' % (_DIR, config),
-                   'download', '--ignore-match'])
+                   'download', '--branch=%s' % branch])
     else:
         print('\nDownloading Crowdin translations (AOSP supported languages)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/crowdin_%s.yaml' % (_DIR, branch),
-                   'download', '--ignore-match'])
+                   'download', '--branch=%s' % branch])
 
         print('\nDownloading Crowdin translations '
               '(non-AOSP supported languages)')
         check_run(['crowdin-cli',
                    '--config=%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, branch),
-                   'download', '--ignore-match'])
+                   'download', '--branch=%s' % branch])
 
     print('\nRemoving useless empty translation files')
     empty_contents = {
@@ -230,10 +230,10 @@
         files = ['%s/crowdin/%s' % (_DIR, config)]
     else:
         files = ['%s/crowdin/crowdin_%s.yaml' % (_DIR, branch),
-                 '%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, branch)
-                ]
+                 '%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, branch)]
     for c in files:
-        cmd = ['crowdin-cli', '--config=%s' % c, 'list', 'sources']
+        cmd = ['crowdin-cli', '--config=%s' % c, 'list', 'project',
+               '--branch=%s' % branch]
         comm, ret = run_subprocess(cmd)
         if ret != 0:
             sys.exit(ret)
@@ -319,8 +319,7 @@
         files = ['%s/crowdin/%s' % (_DIR, args.config)]
     else:
         files = ['%s/crowdin/crowdin_%s.yaml' % (_DIR, default_branch),
-                 '%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, default_branch)
-                 ]
+                 '%s/crowdin/crowdin_%s_aosp.yaml' % (_DIR, default_branch)]
     if not check_files(files):
         sys.exit(1)