Tidying

Moved methods to their own folder
Simplified some rendering of simple objects, complex objects and
parameters