deleted old files
Refactored several classes. Updated some method names and added some missing tests.