MOD: more package renaming
MOD: changed license