Small clean up in 'Types'.
Ordered and cleaned up 'Types'.

Everything remaining in there is interdependent and would cause cyclic dependencies.