Separate module

Separate some Proxy