Schema Validation policy: package structure fix