Reorganise the directory
Merge branch 'spoutnik_basic' into spoutnik_basic_logging