Avoid duplicating functions across shape modules

[Shfty]

• May be a better idea to put everything inside one module, use provided names to populate per-shape entrypoint functions