Finished refactoring Kitty code

Moved kitty totals out into Kitty module