move schema to own ns, + tests