Conversion to package

converted to package due to recent fix.