changed folder structure and removed git submodule