Major refactoring of the block_manipulation architecture