Splitting into several smaller classes