Refactor structure
Merge pull request #2 from kelseymok/refactor

Refactor structure