move proxies for extensions to respective inner classes