11: Reorganize and refactor core

Task-Url: #11
1 job for v2.0-dev in 1 minute and 55 seconds (queued for 1 second)