Cleaned up routing and CMS usage, added blocks to migration, updated submodules