move saver classes to own package