re factored schema package. simplified and reduced classes.