some renames and big refactoring: adapter entity entroduced
Adapters introduced, a lot of renamings && refactorings