Renamed and removed files
Rewrite in sage