Refactor: arrange module header