Fix runes, also move to appropriate packages
Merge pull request #1 from viper283/master

Fix runes