added name spaceing
adding schemas and formatting