add context modules and move modules to contrib folder under modules