Architecture change. (new modules structure - part 2)