Refactoring. Activities with BaseActivity, package design.