error fixing and package renaming