Refactor the Lithium files

Merged Michael Sammler requested to merge time/refactor_lithium_files into master

Merge request reports