Refactored + moved changes to appropriate modules
Merge pull request #51 from devynspencer/coredmp

Refactored + moved changes to appropriate modules