misc. config changes, get rid of submodules that are now packages