Revert "Only activity and MainActivity"

This reverts commit 5c24dbf4e4e735dc50f88a212c7d49082d28ad3c.