Updated packages in "shapes" subdirectory. This should probably be moved eventually...