version 2.1

Deleted some discarded files and updated some new files