Conversion to ClassLib and commenting