Added BlockType/BlockHelper classes.

Refactoring pretty much done.