reorganize module declaration