[WH-43] Full refactoring - add refactored module