Move all creation of blocks to the main core package.  More todo