Cleanup and move stuff around

Christian Rochacommitted parent 060741e9c35136ef47042954331f8d30edc48cb199bc90aBrowse files
26 files changed+29−35

Rendering diff…