Refactor Lithium

Merged Michael Sammler requested to merge time/refactor_lithium into master

Merge request reports