Work in progress: Refactor ugly list hierarchy of
classes/views/templates