create ui.shape package and move Shape stuff into it