Modified package names and some code