extraction from other project = big refactoring