remove scala, move everything into bundles with pathogen, fix a few
shortcuts