refactor to put schemas into single namespace