Restructured some modules.