Move functions to restoration submodule