Fix runes, also move to appropriate packages