[WIP] Minor refactoring to bring some structrue in the module