Refactored Block
Added Block_Test
Removed ShapeConfiguration
Removed ConcreteShape
pull from origin