[#3] Renamed modules

 Moved katana fns to their own modules.