Refactored: moved to latest http-proxy, code reorganization, ...