moved around to reflect new code location.
Merge pull request #23 from Tzinov15/jkinnard

moved around to reflect new code location.