Reorganize utils
add files
remove file
merge w/ master
Merge pull request #344 from rmcgibbo/reorg-utils

Reorganize utils