Deleted some unused files and added some old ones
changed gitignore
Changed name of exception
Cleanup (work on #3, finished #1, work on #9)