Separated some classes from main activity