Added Uid to object instances
Relocating new proxy classes
Project refactoring