More cleanup. Removed deprecated proxies.
Moved blocks and items.