refactor(activity): move into submodule