renamed persistence layer and DAO