cleanup: tweak settings, fix typos, move folders