- preparaions for UI extension;
- refactoing: renamed classes/fields, moved some code;