Added git submodules, necessary path changes