[Master] Remove submodule. Easier to just do with folders