Started moving around some code

Moved the blocks into their own new file and also started the proxies