Remove old files
Modify master-with-sat