Broke utility functions into a few files