Better code layout
Merge pull request #2 from agiliq/refactor-names

Better code layout