Separated to different classes

Separated to different classes