Move utility functions into utils
Merge pull request #206 from krazemon/utils

Move utility functions into utils