Moved schema.go to schema Package