Changed dir structure. Piece shape.