add 'income' package and classes,
change other packeges names