move modules to scope package