package rename, starting header cleanup