Refactoring: Moved save and reload logic to separate modules