refactored and importing yaml files into schema