Move stuff around and add SingletonRune