Added some organization to the block classes by putting certain blocks in sub-packages.