Entity: removed interfaces
DAO: implementation moved to different folder