clean up structure
Merge pull request #3 from calvinmetcalf/clean-structure

clean up structure