Moved Piece into model package