Moved nested types from Style and Line.

Nested types are pain in usability.