Moved field shape definition to a new trait & added Cube field shape.