package rename, code cleanup