Refactored

Refactored to match file structure of https://github.com/rjrodger/nodezoo-npm