continue to refactor modules management