Move Block to its own header