fixed layout for consistency, grail in equilibrium
refining db model and namespaces