preparing docs & module architecture consistency