Merge pull request #3 from neongreen/master

Break code into modules.