Moved keyring modules to new file