Refactor
Splitting classes