cleanup and package rename