Remove submodule
Reorganise directory structure