Re-integrate Flask-Kit and dip-kit.