remove old files and change Shape enum