Refactor: arrange module header
Merge remote-tracking branch 'origin/i0013'