Turn all runtime classes into non-templated classes (#830)

Turn all runtime classes into non-templated classes (#830) #112