folder reorg to enable install_github