Refactored methods for less repetition
Changed name of file
Moved into its own class
Added more tests
Removed old files