(feat) Reorganize because of namespaced enums.