restructured code
Merge branch 'master' of github.com:jlauinger/proxy