Fix docs to follow the modularization