Change entities; change packages; create daos for entities; direct from DatabaseService to DAOs
merge and fix merge errors