Restructure code for pulling validation schemas