rework folders/projects
update from upstream
adopt upstream branch
submodule update
use submodule version