Moved class file to library