Moved activity into module
Moved activity into module, like system