Rename block_t to block_info_t and move it to block.hpp. Use it there