Splitting classes
Modelling settings
Dropping unnecessary library