Re-organises into modules.