Merge pull request #151 from jasnell/layering

HTTP Layer rework...