[master] Complete all 6 modules and add spacing