Improve dependency management

[bonjourmauko]

• [x] #1158
• [x] #1160
• [x] #1234
• [x] #1257
• [ ] #1015
• [ ] Fixed circular dependency core <> country/extension