Changed structure of data access layer and domain level.