Small relocating
Rework of schema and add clients