fix require bug, updated client
Merge pull request #82 from dannycoates/bugfix

fix require bug, updated client
reorganize files to hopefully be more sane
Merge pull request #83 from dannycoates/reorg

reorganize files to hopefully be more sane