TODO: Fix reRun code
Adding samples as a submodule
Adjusting submodules