Move MainActivity
Added BaseActivity