Moved shapes into model.shapes package