WIP
Fix most test failures
Merge schemas and Models
Simplify normalizers into plain functions