Converting file to a class

Fixed a few things ;)
Merge pull request #1 from IAmPhoenix/patch-1

Converting file to a class