Moving schemas to includes