Move backup stuff into correct namespace

Guest should only be for things needing to be used for RPC
messages.