Refactore data structures/modules.