Restructuring class Save