More refactoring in Renderer. Separating native types. Better conventions.