cleanup: added header comments, moved around some code
merge master
Merge pull request #66 from claydotio/root-cleanup

cleanup: added header comments, moved around some code