move modules to components