Refactoring - no functional changes.
Merge pull request #14 from edwardwe7/multiple.files

just some refactoring