Seperate the classes a bit

Seperate the classes a bit