big refactor for cleaner codebase
Merge pull request #12 from euforic/refactor

big refactor for cleaner codebase