Removed a pointless test
Moved class to library
Moved class to library
Moved class to library