Reorganised mod and added proxies