RO-6: zend modules layouts and fixes