shortened package names and added data persistant related classes