Move Item and Layout under new ContentPiece class