[wip] Feature/merge planning element type with type

This is the branch that eventually removes planning element types in favor of types.