start using modules
Merge pull request #3 from nottombrown/cleaner-code

start using modules