Reorganized modules for better modularity.