Moving from massive classes to separate classes in the src folder