moved misc helper functions to separate file and removed redundant includes
Merge pull request #43 from JFreegman/master

moved misc helper functions to separate file and removed redundant includes