Refactor to use generic proxy with specific handlers
Restructure domains
Merge branch 'http-proxy'