New class and heavy refactoring on Kentta and Peli