Removed Block Factories, added Block Functions 2

Moved over the rest of the Blocks and their factories. Also fixed load
and save.
Fixes #5