Major restructure centered around the removal of BlockTraits. Additional unit tests to confirm changes.