Merge the initial refactor

Requested reviewer: @ericadamski 
Issue: #13 

### Changes:
* Moved all global scoped function into their appropriate classes
* Fixed minor typos

### Testing:
* Performed manual testing