Spilt classes

I split the classes