Split and cleanup into more meaningfull namespaces.
Change artifact name.
Remove helper function that is used only once and inline the op instead.
Make untupling a bit more idiomatic, with a less ambiguous name.