Moved out functions that are really utilities to the utility header file as well as moved it to a 'shared' place to be shared between different parts of the project