Renamed Proxy file
Added small format and naming changes