Merge "Cat: Move Stk imlpementation into Cat folder"