Moving the helper functions into a their own lib.
Changing the
Revert "Changing the" was commited in error.

This reverts commit 3052016fd85d2c3f044c5f84d4a047d28568b0da.