Refactored modules by adding Chat, and Vehicle as separate modules.