Updated to new structure
Fixed primitive types in modules
Moved additionalProperties at the end