Refractored the module structure.