Restructured modules. Added deal module.