Moved a class to the file of it's own