Add git submodule
Remove manual added code
Switch to new path