made vicious and shifty into submodules