commit before massive refactoring( drag&drop + inner classes processing)