Moved activity to sub-package