change stuff around, use git submodules