Restructured code into Modules.