Moved helper classes to library