Flatten type mapping property tree (#1761)

* Flatten the property tree mapping to remove non-existent types from the spec
* Reorder properties into sections with comments

Author: Anaethelion