Restructured proxies
Merge branch 'master' of https://github.com/rhbvkleef/letsmod-reboot