Moved classes related to save state to their own package.
Moved classes related to save state to their own package.