fixed index
moved util funcs to util folder
Merge pull request #7 from ljwolford/cleanup

Cleanup