clean main mod file up and move some things around, add proxies