Reorganise the directory
Merge branch 'spoutnik_basic'