Rearranged types

[none]