More refactoring of Kitty module

Moved totally of Kitty into  the kitty module