improve persistence and package renaming