Move s-presence into the misc bucket