Refactored in multiple files
Add missing files
Merge pull request #6 from bhoflack/REFACTOR

Refactor