Restructure modules.