massive package rename, courtesy of Eclipse refactor