Add underscore.js back in
Switch to new kui code structure

Switch to new kui code structure