modify package name
move to new dir