Updated so that I will have a good consise version of the master branch.
I also removed files that are no longer needed.