Cleaned up the packages, and merged the two PersistenceUtils