Architecture change. (new modules structure)