Cleaned out the block.

Energy will be re-implemented when the time is there.
Re-organized package to reflect sorting used in other parts of the mod.