Refactoring of module structures and incorporation of DE comments