Adjust the code structure & backup