diff --git a/bazaar/Eigen_demo/Eigen_demo.upp b/reference/Eigen_demo/Eigen_demo.upp
similarity index 70%
rename from bazaar/Eigen_demo/Eigen_demo.upp
rename to reference/Eigen_demo/Eigen_demo.upp
index 1eb09f6cd..0eb2831d4 100644
--- a/bazaar/Eigen_demo/Eigen_demo.upp
+++ b/reference/Eigen_demo/Eigen_demo.upp
@@ -1,4 +1,4 @@
-description "Eigen package demo\377";
+description "plugin/Eigen demo\377";
 
 uses
 	Core,
diff --git a/bazaar/Eigen_demo/eigen_demo.cpp b/reference/Eigen_demo/eigen_demo.cpp
similarity index 100%
rename from bazaar/Eigen_demo/eigen_demo.cpp
rename to reference/Eigen_demo/eigen_demo.cpp
diff --git a/bazaar/Eigen_demo/init b/reference/Eigen_demo/init
similarity index 100%
rename from bazaar/Eigen_demo/init
rename to reference/Eigen_demo/init
diff --git a/bazaar/Eigen_demo/non-linear.cpp b/reference/Eigen_demo/non-linear.cpp
similarity index 100%
rename from bazaar/Eigen_demo/non-linear.cpp
rename to reference/Eigen_demo/non-linear.cpp
diff --git a/uppdev/GtkApp/GtkApp.h b/uppdev/GtkApp/GtkApp.h
index 72269bf56..7239f2569 100644
--- a/uppdev/GtkApp/GtkApp.h
+++ b/uppdev/GtkApp/GtkApp.h
@@ -7,7 +7,7 @@ using namespace Upp;
 
 #include <gtk/gtk.h>
 
-struct GtkDraw : Draw {
+class CairoDraw : public Draw {
 	virtual dword GetInfo() const;
 
 	virtual void BeginOp();
@@ -38,7 +38,6 @@ struct GtkDraw : Draw {
 	virtual void DrawTextOp(int x, int y, int angle, const wchar *text, Font font,
 		                    Color ink, int n, const int *dx);
 
-	cairo_t *cr;
 
 private:
 	void  SetColor(Color c);
@@ -47,6 +46,38 @@ private:
 	void  Push();
 	void  Pop();
 	Vector<Point> offset;
+
+	cairo_t *cr;
+	CairoDraw() {}
+	
+	friend class CairoImageDraw;
+
+public:
+	operator cairo_t*()              { return cr; }
+
+	CairoDraw(cairo_t *cr) : cr(cr) {}
+};
+
+class CairoImageDraw : public CairoDraw {
+	cairo_surface_t *surface;
+	Size             isz;
+	
+	CairoDraw        alpha;
+	cairo_surface_t *alpha_surface;
+
+	void Init(Size sz);
+	void FetchStraight(ImageBuffer& b) const;
+
+public:
+	Draw& Alpha();                       
+
+	operator Image() const;
+
+	Image GetStraight() const;
+
+	CairoImageDraw(Size sz);
+	CairoImageDraw(int cx, int cy);
+	~CairoImageDraw();
 };
 
 #endif
diff --git a/uppdev/GtkApp/GtkApp.upp b/uppdev/GtkApp/GtkApp.upp
index 04afbeb01..5244812d6 100644
--- a/uppdev/GtkApp/GtkApp.upp
+++ b/uppdev/GtkApp/GtkApp.upp
@@ -1,5 +1,6 @@
 uses
-	Draw;
+	Draw,
+	plugin/png;
 
 library
 	"gtk-x11-2.0  gdk-x11-2.0  atk-1.0  gdk_pixbuf-2.0  m  pangocairo-1.0  fontconfig  Xext  Xrender  Xinerama  Xi  Xrandr  Xcursor Xfixes pango-1.0  cairo  X11  gobject-2.0  gmodule-2.0  glib-2.0";
@@ -8,6 +9,8 @@ file
 	Test.iml,
 	GtkApp.h,
 	GtkDraw.cpp,
+	ImageDraw.cpp,
+	BackDraw.cpp,
 	main.cpp;
 
 mainconfig
diff --git a/uppdev/GtkApp/GtkDraw.cpp b/uppdev/GtkApp/GtkDraw.cpp
index 18c2c7da0..23ea0aa08 100644
--- a/uppdev/GtkApp/GtkDraw.cpp
+++ b/uppdev/GtkApp/GtkDraw.cpp
@@ -2,57 +2,59 @@
 
 #include <cairo/cairo-ft.h>
 
-void GtkDraw::SetColor(Color c)
+#define LLOG(x)
+
+void CairoDraw::SetColor(Color c)
 {
 	cairo_set_source_rgb(cr, c.GetR() / 255.0, c.GetG() / 255.0, c.GetB() / 255.0);
 }
 
-dword GtkDraw::GetInfo() const
+dword CairoDraw::GetInfo() const
 {
 	return DRAWTEXTLINES;
 }
 
-Point GtkDraw::GetOffset() const
+Point CairoDraw::GetOffset() const
 {
 	return offset.GetCount() ? offset.Top() : Point(0, 0);
 }
 
-void GtkDraw::Push()
+void CairoDraw::Push()
 {
 	cairo_save(cr);
 	offset.Add(GetOffset());
 }
 
-void GtkDraw::Pop()
+void CairoDraw::Pop()
 {
 	if(offset.GetCount())
 		offset.Drop();
 	cairo_restore(cr);
 }
 
-void GtkDraw::BeginOp()
+void CairoDraw::BeginOp()
 {
 	Push();
 }
 
-void GtkDraw::EndOp()
+void CairoDraw::EndOp()
 {
 	Pop();
 }
 
-void GtkDraw::OffsetOp(Point p)
+void CairoDraw::OffsetOp(Point p)
 {
 	Push();
 	offset.Top() += p;
 	cairo_translate(cr, p.x, p.y);
 }
 
-void GtkDraw::RectPath(const Rect& r)
+void CairoDraw::RectPath(const Rect& r)
 {
 	cairo_rectangle(cr, r.left, r.top, r.GetWidth(), r.GetHeight());
 }
 
-bool GtkDraw::ClipOp(const Rect& r)
+bool CairoDraw::ClipOp(const Rect& r)
 {
 	Push();
 	RectPath(r);
@@ -60,7 +62,7 @@ bool GtkDraw::ClipOp(const Rect& r)
 	return true;
 }
 
-bool GtkDraw::ClipoffOp(const Rect& r)
+bool CairoDraw::ClipoffOp(const Rect& r)
 {
 	Push();
 	offset.Top() += r.TopLeft();
@@ -70,7 +72,7 @@ bool GtkDraw::ClipoffOp(const Rect& r)
 	return true;
 }
 
-bool GtkDraw::ExcludeClipOp(const Rect& r)
+bool CairoDraw::ExcludeClipOp(const Rect& r)
 {
 	RectPath(Rect(-99999, -99999, 99999, r.top));
 	RectPath(Rect(-99999, r.top, r.left, 99999));
@@ -80,35 +82,43 @@ bool GtkDraw::ExcludeClipOp(const Rect& r)
 	return true;
 }
 
-bool GtkDraw::IntersectClipOp(const Rect& r)
+bool CairoDraw::IntersectClipOp(const Rect& r)
 {
 	RectPath(r);
 	cairo_clip(cr);
 	return true;
 }
 
-bool GtkDraw::IsPaintingOp(const Rect& r) const
+bool CairoDraw::IsPaintingOp(const Rect& r) const
 {
 	return true;
 }
 
-Rect GtkDraw::GetPaintRect() const
+Rect CairoDraw::GetPaintRect() const
 {
 	return Rect(0, 0, INT_MAX, INT_MAX);
 }
 
-void GtkDraw::DrawRectOp(int x, int y, int cx, int cy, Color color)
+void CairoDraw::DrawRectOp(int x, int y, int cx, int cy, Color color)
 {
 	SetColor(color);
 	cairo_rectangle(cr, x, y, cx, cy);
 	cairo_fill(cr);
 }
 
-void GtkDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
+struct ImageSysData {
+	Image            img;
+	cairo_surface_t *surface;
+	
+	void Init(const Image& img);
+	~ImageSysData();
+};
+
+void ImageSysData::Init(const Image& m)
 {
-	// TODO: cache cairo_surfaces
+	img = m;
 	Size isz = img.GetSize();
-	cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, isz.cx, isz.cy);
+	surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, isz.cx, isz.cy);
 	cairo_surface_flush(surface);
 	byte *a = (byte *)cairo_image_surface_get_data(surface);
 	int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, isz.cx);
@@ -117,18 +127,45 @@ void GtkDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
 		a += stride;
 	}
 	cairo_surface_mark_dirty(surface);
-	if(!IsNull(color)) {
-		SetColor(color);
-		cairo_mask_surface(cr, surface, x, y);
-	}
-	else {
-		cairo_set_source_surface(cr, surface, x, y);
-		cairo_paint(cr);
-	}
+	SysImageRealized(img);
+}
+
+ImageSysData::~ImageSysData()
+{
+	SysImageReleased(img);
 	cairo_surface_destroy(surface);
 }
 
-void GtkDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
+struct ImageSysDataMaker : LRUCache<ImageSysData, int64>::Maker {
+	Image img;
+
+	virtual int64  Key() const                      { return img.GetSerialId(); }
+	virtual int    Make(ImageSysData& object) const { object.Init(img); return img.GetLength(); }
+};
+
+void CairoDraw::SysDrawImageOp(int x, int y, const Image& img, Color color)
+{
+	GuiLock __;
+	if(img.GetLength() == 0)
+		return;
+	LLOG("SysDrawImageOp " << img.GetSerialId() << ' ' << img.GetSize());
+	ImageSysDataMaker m;
+	static LRUCache<ImageSysData, int64> cache;
+	LLOG("SysImage cache pixels " << cache.GetSize() << ", count " << cache.GetCount());
+	m.img = img;
+	ImageSysData& sd = cache.Get(m);
+	if(!IsNull(color)) {
+		SetColor(color);
+		cairo_mask_surface(cr, sd.surface, x, y);
+	}
+	else {
+		cairo_set_source_surface(cr, sd.surface, x, y);
+		cairo_paint(cr);
+	}
+	cache.Shrink(4 * 1024 * 768, 1000); // Cache must be after Paint because of PaintOnly!
+}
+
+void CairoDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
 {
 	SetColor(color);
 	cairo_move_to(cr, x1, y1);
@@ -137,19 +174,19 @@ void GtkDraw::DrawLineOp(int x1, int y1, int x2, int y2, int width, Color color)
 	cairo_stroke(cr);
 }
 
-void GtkDraw::DrawPolyPolylineOp(const Point *vertices, int vertex_count, const int *counts, int count_count, int width, Color color, Color doxor)
+void CairoDraw::DrawPolyPolylineOp(const Point *vertices, int vertex_count, const int *counts, int count_count, int width, Color color, Color doxor)
 {
 }
 
-void GtkDraw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count, const int *subpolygon_counts, int scc, const int *disjunct_polygon_counts, int dpcc, Color color, int width, Color outline, uint64 pattern, Color doxor)
+void CairoDraw::DrawPolyPolyPolygonOp(const Point *vertices, int vertex_count, const int *subpolygon_counts, int scc, const int *disjunct_polygon_counts, int dpcc, Color color, int width, Color outline, uint64 pattern, Color doxor)
 {
 }
 
-void GtkDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
+void CairoDraw::DrawArcOp(const Rect& rc, Point start, Point end, int width, Color color)
 {
 }
 
-void GtkDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor)
+void CairoDraw::DrawEllipseOp(const Rect& r, Color color, int pen, Color pencolor)
 {
 }
 
@@ -158,46 +195,69 @@ FcPattern *CreateFcPattern(Font font);
 FT_Face    FTFace(Font fnt, String *rpath = NULL);
 };
 
-void GtkDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, Color ink, int n, const int *dx)
+struct FontSysData {
+	cairo_scaled_font_t *scaled_font;
+	
+	void Init(Font font, int angle);
+	~FontSysData() { cairo_scaled_font_destroy(scaled_font); }
+};
+
+void FontSysData::Init(Font font, int angle)
 {
+	DLOG("FontSysData::Init " << font << ", " << angle);
 	FcPattern *p = CreateFcPattern(font);
 	cairo_font_face_t *font_face = cairo_ft_font_face_create_for_pattern(p);
 	FcPatternDestroy(p);
-
-	int xpos = 0;	
-	Buffer<cairo_glyph_t> gs(n);
-	for(int i = 0; i < n; i++) {
-		cairo_glyph_t& g = gs[i];
-		g.index = FT_Get_Char_Index(FTFace(font), text[i]);
-		g.x = x + xpos;
-		g.y = y + font.GetAscent();
-		xpos += dx ? dx[i] : font[text[i]];
-	}
 	
-#if 1
 	cairo_matrix_t font_matrix[1], ctm[1];
 	cairo_matrix_init_identity(ctm);
 	cairo_matrix_init_scale(font_matrix, font.GetHeight(), font.GetHeight());
 	if(angle)
 		cairo_matrix_rotate(font_matrix, -angle * M_2PI / 3600);
-
 	cairo_font_options_t *opt = cairo_font_options_create();
-	
-	cairo_scaled_font_t *sf = cairo_scaled_font_create(font_face, font_matrix, ctm, opt);
-	SetColor(ink);
-	cairo_set_scaled_font(cr, sf);
-
- 	cairo_show_glyphs(cr, gs, n);
+	scaled_font = cairo_scaled_font_create(font_face, font_matrix, ctm, opt);
 
 	cairo_font_options_destroy(opt);
-	cairo_scaled_font_destroy(sf);
-#else	
- 	cairo_set_font_face(cr, face);
- 	cairo_set_font_size(cr, font.GetHeight());
-	SetColor(ink);
-	DDUMP(y + font.GetAscent());
- 	cairo_show_glyphs(cr, gs, n);
-#endif
-
  	cairo_font_face_destroy(font_face);
 }
+
+struct FontDataSysMaker : LRUCache<FontSysData, Tuple2<Font, int> >::Maker {
+	Font font;
+	int  angle;
+
+	virtual Tuple2<Font, int>  Key() const        { return MakeTuple(font, angle); }
+	virtual int Make(FontSysData& object) const   { object.Init(font, angle); return 1; }
+};
+
+void CairoDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, Color ink, int n, const int *dx)
+{
+	GuiLock __;
+	
+	int ascent = font.GetAscent();
+	double sina = 0;
+	double cosa = 1;
+	if(angle)
+		Draw::SinCos(angle, sina, cosa);
+	int xpos = 0;	
+	Buffer<cairo_glyph_t> gs(n);
+	for(int i = 0; i < n; i++) {
+		cairo_glyph_t& g = gs[i];
+		g.index = GetGlyphInfo(font, text[i]).glyphi;
+		g.x = fround(x + cosa * xpos + sina * ascent);
+		g.y = fround(y + cosa * ascent - sina * xpos);
+		xpos += dx ? dx[i] : font[text[i]];
+	}
+
+	static LRUCache<FontSysData, Tuple2<Font, int> > cache;
+	FontDataSysMaker m;
+	m.font = font;
+	m.angle = angle;
+	FontSysData& sf = cache.Get(m);
+	
+	cairo_set_scaled_font(cr, sf.scaled_font);
+
+	SetColor(ink);
+ 	cairo_show_glyphs(cr, gs, n);
+ 	
+ 	cache.Shrink(64);
+}
diff --git a/uppdev/GtkApp/init b/uppdev/GtkApp/init
index 8b0f4bd81..7103091a5 100644
--- a/uppdev/GtkApp/init
+++ b/uppdev/GtkApp/init
@@ -1,4 +1,5 @@
 #ifndef _GtkApp_icpp_init_stub
 #define _GtkApp_icpp_init_stub
 #include "Draw/init"
+#include "plugin/png/init"
 #endif
diff --git a/uppdev/GtkApp/main.cpp b/uppdev/GtkApp/main.cpp
index 21786ae5c..1d4e6adf8 100644
--- a/uppdev/GtkApp/main.cpp
+++ b/uppdev/GtkApp/main.cpp
@@ -10,6 +10,7 @@
 
 void TestDraw(Draw& w)
 {
+	w.DrawRect(0, 0, 10000, 10000, WhiteGray());
 	w.DrawRect(0, 0, 100, 100, Yellow());
 	
 	w.DrawLine(10, 40, 400, 20, 3, Blue());
@@ -46,23 +47,41 @@ void TestDraw(Draw& w)
 	w.DrawText(0, 0, text, fnt);
 	w.DrawText(0, 70, text, fnt, Blue(), dx.GetCount(), dx.Begin());
 	
-	w.DrawText(50, 400, 200, "Angled text", Arial(100).Underline(), Black());
+	w.DrawRect(50, 400, 2, 2, Black());
+	w.DrawText(50, 400, 200, "Angled text", Arial(50).Underline(), Red());
+
+	w.DrawRect(600, 400, 2, 2, Black());
+	w.DrawText(600, 400, 1000, "Angled text", Arial(50).Underline(), Black());
+	w.End();
 }
 
 static gboolean on_expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
 {
-	GtkDraw w;
-	w.cr = gdk_cairo_create(widget->window);
+	CairoDraw w(gdk_cairo_create(widget->window));
 
 	TestDraw(w);
 
-	cairo_destroy(w.cr);
+	cairo_destroy(w);
 	
 	return FALSE;
 }
 
 int main( int argc, char *argv[])
 {
+	{
+		CairoImageDraw w(1000, 1000);
+		TestDraw(w);
+		PNGEncoder().SaveFile("/home/cxl/test.png", w);
+	}
+
+	{
+		CairoImageDraw w(1000, 1000);
+		TestDraw(w);
+		for(int i = 0; i < 100; i++)
+			w.Alpha().DrawRect(i * 10, 0, 10, 1000, GrayColor(255 - i));
+		PNGEncoder().SaveFile("/home/cxl/test_alpha.png", w);
+	}
+	
 	GtkWidget *window;
 	
 	gtk_init(&argc, &argv);
diff --git a/bazaar/plugin/Eigen/COPYING.GPL b/uppsrc/plugin/Eigen/COPYING.GPL
similarity index 100%
rename from bazaar/plugin/Eigen/COPYING.GPL
rename to uppsrc/plugin/Eigen/COPYING.GPL
diff --git a/bazaar/plugin/Eigen/COPYING.LGPL b/uppsrc/plugin/Eigen/COPYING.LGPL
similarity index 100%
rename from bazaar/plugin/Eigen/COPYING.LGPL
rename to uppsrc/plugin/Eigen/COPYING.LGPL
diff --git a/bazaar/plugin/Eigen/Eigen.cpp b/uppsrc/plugin/Eigen/Eigen.cpp
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen.cpp
rename to uppsrc/plugin/Eigen/Eigen.cpp
diff --git a/bazaar/plugin/Eigen/Eigen.h b/uppsrc/plugin/Eigen/Eigen.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen.h
rename to uppsrc/plugin/Eigen/Eigen.h
diff --git a/bazaar/plugin/Eigen/Eigen.upp b/uppsrc/plugin/Eigen/Eigen.upp
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen.upp
rename to uppsrc/plugin/Eigen/Eigen.upp
diff --git a/bazaar/plugin/Eigen/Eigen/Array b/uppsrc/plugin/Eigen/Eigen/Array
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Array
rename to uppsrc/plugin/Eigen/Eigen/Array
diff --git a/bazaar/plugin/Eigen/Eigen/Cholesky b/uppsrc/plugin/Eigen/Eigen/Cholesky
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Cholesky
rename to uppsrc/plugin/Eigen/Eigen/Cholesky
diff --git a/bazaar/plugin/Eigen/Eigen/Core b/uppsrc/plugin/Eigen/Eigen/Core
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Core
rename to uppsrc/plugin/Eigen/Eigen/Core
diff --git a/bazaar/plugin/Eigen/Eigen/Dense b/uppsrc/plugin/Eigen/Eigen/Dense
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Dense
rename to uppsrc/plugin/Eigen/Eigen/Dense
diff --git a/bazaar/plugin/Eigen/Eigen/Eigen b/uppsrc/plugin/Eigen/Eigen/Eigen
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Eigen
rename to uppsrc/plugin/Eigen/Eigen/Eigen
diff --git a/bazaar/plugin/Eigen/Eigen/Eigen2Support b/uppsrc/plugin/Eigen/Eigen/Eigen2Support
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Eigen2Support
rename to uppsrc/plugin/Eigen/Eigen/Eigen2Support
diff --git a/bazaar/plugin/Eigen/Eigen/Eigenvalues b/uppsrc/plugin/Eigen/Eigen/Eigenvalues
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Eigenvalues
rename to uppsrc/plugin/Eigen/Eigen/Eigenvalues
diff --git a/bazaar/plugin/Eigen/Eigen/Geometry b/uppsrc/plugin/Eigen/Eigen/Geometry
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Geometry
rename to uppsrc/plugin/Eigen/Eigen/Geometry
diff --git a/bazaar/plugin/Eigen/Eigen/Householder b/uppsrc/plugin/Eigen/Eigen/Householder
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Householder
rename to uppsrc/plugin/Eigen/Eigen/Householder
diff --git a/bazaar/plugin/Eigen/Eigen/Jacobi b/uppsrc/plugin/Eigen/Eigen/Jacobi
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Jacobi
rename to uppsrc/plugin/Eigen/Eigen/Jacobi
diff --git a/bazaar/plugin/Eigen/Eigen/LU b/uppsrc/plugin/Eigen/Eigen/LU
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/LU
rename to uppsrc/plugin/Eigen/Eigen/LU
diff --git a/bazaar/plugin/Eigen/Eigen/LeastSquares b/uppsrc/plugin/Eigen/Eigen/LeastSquares
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/LeastSquares
rename to uppsrc/plugin/Eigen/Eigen/LeastSquares
diff --git a/bazaar/plugin/Eigen/Eigen/QR b/uppsrc/plugin/Eigen/Eigen/QR
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/QR
rename to uppsrc/plugin/Eigen/Eigen/QR
diff --git a/bazaar/plugin/Eigen/Eigen/QtAlignedMalloc b/uppsrc/plugin/Eigen/Eigen/QtAlignedMalloc
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/QtAlignedMalloc
rename to uppsrc/plugin/Eigen/Eigen/QtAlignedMalloc
diff --git a/bazaar/plugin/Eigen/Eigen/SVD b/uppsrc/plugin/Eigen/Eigen/SVD
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/SVD
rename to uppsrc/plugin/Eigen/Eigen/SVD
diff --git a/bazaar/plugin/Eigen/Eigen/Sparse b/uppsrc/plugin/Eigen/Eigen/Sparse
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/Sparse
rename to uppsrc/plugin/Eigen/Eigen/Sparse
diff --git a/bazaar/plugin/Eigen/Eigen/StdDeque b/uppsrc/plugin/Eigen/Eigen/StdDeque
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/StdDeque
rename to uppsrc/plugin/Eigen/Eigen/StdDeque
diff --git a/bazaar/plugin/Eigen/Eigen/StdList b/uppsrc/plugin/Eigen/Eigen/StdList
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/StdList
rename to uppsrc/plugin/Eigen/Eigen/StdList
diff --git a/bazaar/plugin/Eigen/Eigen/StdVector b/uppsrc/plugin/Eigen/Eigen/StdVector
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/StdVector
rename to uppsrc/plugin/Eigen/Eigen/StdVector
diff --git a/bazaar/plugin/Eigen/Eigen/src/Cholesky/LDLT.h b/uppsrc/plugin/Eigen/Eigen/src/Cholesky/LDLT.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Cholesky/LDLT.h
rename to uppsrc/plugin/Eigen/Eigen/src/Cholesky/LDLT.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Cholesky/LLT.h b/uppsrc/plugin/Eigen/Eigen/src/Cholesky/LLT.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Cholesky/LLT.h
rename to uppsrc/plugin/Eigen/Eigen/src/Cholesky/LLT.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Array.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Array.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Array.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Array.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/ArrayBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/ArrayBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/ArrayBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/ArrayBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/ArrayWrapper.h b/uppsrc/plugin/Eigen/Eigen/src/Core/ArrayWrapper.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/ArrayWrapper.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/ArrayWrapper.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Assign.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Assign.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Assign.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Assign.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/BandMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/BandMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/BandMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/BandMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Block.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Block.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Block.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Block.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/BooleanRedux.h b/uppsrc/plugin/Eigen/Eigen/src/Core/BooleanRedux.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/BooleanRedux.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/BooleanRedux.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/CommaInitializer.h b/uppsrc/plugin/Eigen/Eigen/src/Core/CommaInitializer.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/CommaInitializer.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/CommaInitializer.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/CwiseBinaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Core/CwiseBinaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/CwiseBinaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/CwiseBinaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/CwiseNullaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Core/CwiseNullaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/CwiseNullaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/CwiseNullaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/CwiseUnaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Core/CwiseUnaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/CwiseUnaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/CwiseUnaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/CwiseUnaryView.h b/uppsrc/plugin/Eigen/Eigen/src/Core/CwiseUnaryView.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/CwiseUnaryView.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/CwiseUnaryView.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/DenseBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/DenseBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/DenseBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/DenseBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/DenseCoeffsBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/DenseCoeffsBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/DenseCoeffsBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/DenseCoeffsBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/DenseStorage.h b/uppsrc/plugin/Eigen/Eigen/src/Core/DenseStorage.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/DenseStorage.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/DenseStorage.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Diagonal.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Diagonal.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Diagonal.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Diagonal.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/DiagonalMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/DiagonalMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/DiagonalMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/DiagonalMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/DiagonalProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Core/DiagonalProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/DiagonalProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/DiagonalProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Dot.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Dot.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Dot.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Dot.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/EigenBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/EigenBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/EigenBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/EigenBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Flagged.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Flagged.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Flagged.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Flagged.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/ForceAlignedAccess.h b/uppsrc/plugin/Eigen/Eigen/src/Core/ForceAlignedAccess.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/ForceAlignedAccess.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/ForceAlignedAccess.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Functors.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Functors.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Functors.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Functors.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Fuzzy.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Fuzzy.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Fuzzy.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Fuzzy.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/GenericPacketMath.h b/uppsrc/plugin/Eigen/Eigen/src/Core/GenericPacketMath.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/GenericPacketMath.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/GenericPacketMath.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/GlobalFunctions.h b/uppsrc/plugin/Eigen/Eigen/src/Core/GlobalFunctions.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/GlobalFunctions.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/GlobalFunctions.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/IO.h b/uppsrc/plugin/Eigen/Eigen/src/Core/IO.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/IO.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/IO.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Map.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Map.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Map.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Map.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/MapBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/MapBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/MapBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/MapBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/MathFunctions.h b/uppsrc/plugin/Eigen/Eigen/src/Core/MathFunctions.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/MathFunctions.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/MathFunctions.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Matrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Matrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Matrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Matrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/MatrixBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/MatrixBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/MatrixBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/MatrixBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/NestByValue.h b/uppsrc/plugin/Eigen/Eigen/src/Core/NestByValue.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/NestByValue.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/NestByValue.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/NoAlias.h b/uppsrc/plugin/Eigen/Eigen/src/Core/NoAlias.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/NoAlias.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/NoAlias.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/NumTraits.h b/uppsrc/plugin/Eigen/Eigen/src/Core/NumTraits.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/NumTraits.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/NumTraits.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/PermutationMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/PermutationMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/PermutationMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/PermutationMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/PlainObjectBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/PlainObjectBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/PlainObjectBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/PlainObjectBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Product.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Product.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Product.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Product.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/ProductBase.h b/uppsrc/plugin/Eigen/Eigen/src/Core/ProductBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/ProductBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/ProductBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Random.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Random.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Random.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Random.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Redux.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Redux.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Redux.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Redux.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Replicate.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Replicate.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Replicate.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Replicate.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/ReturnByValue.h b/uppsrc/plugin/Eigen/Eigen/src/Core/ReturnByValue.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/ReturnByValue.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/ReturnByValue.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Reverse.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Reverse.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Reverse.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Reverse.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Select.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Select.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Select.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Select.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/SelfAdjointView.h b/uppsrc/plugin/Eigen/Eigen/src/Core/SelfAdjointView.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/SelfAdjointView.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/SelfAdjointView.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/SelfCwiseBinaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Core/SelfCwiseBinaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/SelfCwiseBinaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/SelfCwiseBinaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/SolveTriangular.h b/uppsrc/plugin/Eigen/Eigen/src/Core/SolveTriangular.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/SolveTriangular.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/SolveTriangular.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/StableNorm.h b/uppsrc/plugin/Eigen/Eigen/src/Core/StableNorm.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/StableNorm.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/StableNorm.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Stride.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Stride.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Stride.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Stride.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Swap.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Swap.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Swap.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Swap.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Transpose.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Transpose.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Transpose.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Transpose.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Transpositions.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Transpositions.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Transpositions.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Transpositions.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/TriangularMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/TriangularMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/TriangularMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/TriangularMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/VectorBlock.h b/uppsrc/plugin/Eigen/Eigen/src/Core/VectorBlock.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/VectorBlock.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/VectorBlock.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/VectorwiseOp.h b/uppsrc/plugin/Eigen/Eigen/src/Core/VectorwiseOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/VectorwiseOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/VectorwiseOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/Visitor.h b/uppsrc/plugin/Eigen/Eigen/src/Core/Visitor.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/Visitor.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/Visitor.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/AltiVec/Complex.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/AltiVec/Complex.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/AltiVec/Complex.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/AltiVec/Complex.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/AltiVec/PacketMath.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/Default/Settings.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/Default/Settings.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/Default/Settings.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/Default/Settings.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/NEON/Complex.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/NEON/Complex.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/NEON/Complex.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/NEON/Complex.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/NEON/PacketMath.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/NEON/PacketMath.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/NEON/PacketMath.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/NEON/PacketMath.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/Complex.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/Complex.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/Complex.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/Complex.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/MathFunctions.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/MathFunctions.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/MathFunctions.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/MathFunctions.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/PacketMath.h b/uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/PacketMath.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/arch/SSE/PacketMath.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/arch/SSE/PacketMath.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/CoeffBasedProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/CoeffBasedProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/CoeffBasedProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/CoeffBasedProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralBlockPanelKernel.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixVector.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/GeneralMatrixVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/Parallelizer.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/Parallelizer.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/Parallelizer.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/Parallelizer.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointMatrixVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointRank2Update.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointRank2Update.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/SelfadjointRank2Update.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/SelfadjointRank2Update.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixVector.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularMatrixVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularSolverMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularSolverMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularSolverMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularSolverMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularSolverVector.h b/uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularSolverVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/products/TriangularSolverVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/products/TriangularSolverVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/BlasUtil.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/BlasUtil.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/BlasUtil.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/BlasUtil.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/Constants.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/Constants.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/Constants.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/Constants.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/DisableStupidWarnings.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/DisableStupidWarnings.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/DisableStupidWarnings.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/DisableStupidWarnings.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/ForwardDeclarations.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/ForwardDeclarations.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/ForwardDeclarations.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/ForwardDeclarations.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/Macros.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/Macros.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/Macros.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/Macros.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/Memory.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/Memory.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/Memory.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/Memory.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/Meta.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/Meta.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/Meta.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/Meta.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/ReenableStupidWarnings.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/ReenableStupidWarnings.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/ReenableStupidWarnings.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/ReenableStupidWarnings.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/StaticAssert.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/StaticAssert.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/StaticAssert.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/StaticAssert.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Core/util/XprHelper.h b/uppsrc/plugin/Eigen/Eigen/src/Core/util/XprHelper.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Core/util/XprHelper.h
rename to uppsrc/plugin/Eigen/Eigen/src/Core/util/XprHelper.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Block.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Block.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Block.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Block.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Cwise.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Cwise.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Cwise.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Cwise.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/CwiseOperators.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/CwiseOperators.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/CwiseOperators.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/CwiseOperators.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AlignedBox.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/All.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/All.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/All.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/All.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AngleAxis.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Hyperplane.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Quaternion.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Quaternion.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Quaternion.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Quaternion.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Rotation2D.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/RotationBase.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/RotationBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/RotationBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/RotationBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Scaling.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Scaling.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Scaling.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Scaling.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Transform.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Transform.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Transform.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Transform.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Translation.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Translation.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Translation.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Geometry/Translation.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/LU.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/LU.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/LU.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/LU.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Lazy.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Lazy.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Lazy.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Lazy.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/LeastSquares.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/LeastSquares.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/LeastSquares.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/LeastSquares.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Macros.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Macros.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Macros.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Macros.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/MathFunctions.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/MathFunctions.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/MathFunctions.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/MathFunctions.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Memory.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Memory.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Memory.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Memory.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Meta.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Meta.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Meta.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Meta.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Minor.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Minor.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/Minor.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/Minor.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/QR.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/QR.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/QR.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/QR.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/SVD.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/SVD.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/SVD.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/SVD.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/TriangularSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/TriangularSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/TriangularSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/TriangularSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigen2Support/VectorBlock.h b/uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/VectorBlock.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigen2Support/VectorBlock.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigen2Support/VectorBlock.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/ComplexEigenSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/ComplexSchur.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/ComplexSchur.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/ComplexSchur.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/ComplexSchur.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/EigenSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/EigenSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/EigenSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/EigenSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/EigenvaluesCommon.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/EigenvaluesCommon.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/EigenvaluesCommon.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/EigenvaluesCommon.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/HessenbergDecomposition.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/RealSchur.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/RealSchur.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/RealSchur.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/RealSchur.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Eigenvalues/Tridiagonalization.h b/uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/Tridiagonalization.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Eigenvalues/Tridiagonalization.h
rename to uppsrc/plugin/Eigen/Eigen/src/Eigenvalues/Tridiagonalization.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/AlignedBox.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/AlignedBox.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/AlignedBox.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/AlignedBox.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/AngleAxis.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/AngleAxis.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/AngleAxis.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/AngleAxis.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/EulerAngles.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/EulerAngles.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/EulerAngles.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/EulerAngles.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Homogeneous.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Homogeneous.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Homogeneous.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Homogeneous.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Hyperplane.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Hyperplane.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Hyperplane.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Hyperplane.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/OrthoMethods.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/OrthoMethods.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/OrthoMethods.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/OrthoMethods.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/ParametrizedLine.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/ParametrizedLine.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/ParametrizedLine.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/ParametrizedLine.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Quaternion.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Quaternion.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Quaternion.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Quaternion.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Rotation2D.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Rotation2D.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Rotation2D.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Rotation2D.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/RotationBase.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/RotationBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/RotationBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/RotationBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Scaling.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Scaling.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Scaling.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Scaling.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Transform.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Transform.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Transform.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Transform.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Translation.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Translation.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Translation.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Translation.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/Umeyama.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/Umeyama.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/Umeyama.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/Umeyama.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Geometry/arch/Geometry_SSE.h b/uppsrc/plugin/Eigen/Eigen/src/Geometry/arch/Geometry_SSE.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Geometry/arch/Geometry_SSE.h
rename to uppsrc/plugin/Eigen/Eigen/src/Geometry/arch/Geometry_SSE.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Householder/BlockHouseholder.h b/uppsrc/plugin/Eigen/Eigen/src/Householder/BlockHouseholder.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Householder/BlockHouseholder.h
rename to uppsrc/plugin/Eigen/Eigen/src/Householder/BlockHouseholder.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Householder/Householder.h b/uppsrc/plugin/Eigen/Eigen/src/Householder/Householder.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Householder/Householder.h
rename to uppsrc/plugin/Eigen/Eigen/src/Householder/Householder.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Householder/HouseholderSequence.h b/uppsrc/plugin/Eigen/Eigen/src/Householder/HouseholderSequence.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Householder/HouseholderSequence.h
rename to uppsrc/plugin/Eigen/Eigen/src/Householder/HouseholderSequence.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Jacobi/Jacobi.h b/uppsrc/plugin/Eigen/Eigen/src/Jacobi/Jacobi.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Jacobi/Jacobi.h
rename to uppsrc/plugin/Eigen/Eigen/src/Jacobi/Jacobi.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/LU/Determinant.h b/uppsrc/plugin/Eigen/Eigen/src/LU/Determinant.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/LU/Determinant.h
rename to uppsrc/plugin/Eigen/Eigen/src/LU/Determinant.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/LU/FullPivLU.h b/uppsrc/plugin/Eigen/Eigen/src/LU/FullPivLU.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/LU/FullPivLU.h
rename to uppsrc/plugin/Eigen/Eigen/src/LU/FullPivLU.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/LU/Inverse.h b/uppsrc/plugin/Eigen/Eigen/src/LU/Inverse.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/LU/Inverse.h
rename to uppsrc/plugin/Eigen/Eigen/src/LU/Inverse.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/LU/PartialPivLU.h b/uppsrc/plugin/Eigen/Eigen/src/LU/PartialPivLU.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/LU/PartialPivLU.h
rename to uppsrc/plugin/Eigen/Eigen/src/LU/PartialPivLU.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/LU/arch/Inverse_SSE.h b/uppsrc/plugin/Eigen/Eigen/src/LU/arch/Inverse_SSE.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/LU/arch/Inverse_SSE.h
rename to uppsrc/plugin/Eigen/Eigen/src/LU/arch/Inverse_SSE.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/QR/ColPivHouseholderQR.h b/uppsrc/plugin/Eigen/Eigen/src/QR/ColPivHouseholderQR.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/QR/ColPivHouseholderQR.h
rename to uppsrc/plugin/Eigen/Eigen/src/QR/ColPivHouseholderQR.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/QR/FullPivHouseholderQR.h b/uppsrc/plugin/Eigen/Eigen/src/QR/FullPivHouseholderQR.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/QR/FullPivHouseholderQR.h
rename to uppsrc/plugin/Eigen/Eigen/src/QR/FullPivHouseholderQR.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/QR/HouseholderQR.h b/uppsrc/plugin/Eigen/Eigen/src/QR/HouseholderQR.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/QR/HouseholderQR.h
rename to uppsrc/plugin/Eigen/Eigen/src/QR/HouseholderQR.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/SVD/JacobiSVD.h b/uppsrc/plugin/Eigen/Eigen/src/SVD/JacobiSVD.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/SVD/JacobiSVD.h
rename to uppsrc/plugin/Eigen/Eigen/src/SVD/JacobiSVD.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/SVD/UpperBidiagonalization.h b/uppsrc/plugin/Eigen/Eigen/src/SVD/UpperBidiagonalization.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/SVD/UpperBidiagonalization.h
rename to uppsrc/plugin/Eigen/Eigen/src/SVD/UpperBidiagonalization.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/AmbiVector.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/AmbiVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/AmbiVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/AmbiVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/CompressedStorage.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/CompressedStorage.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/CompressedStorage.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/CompressedStorage.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/CoreIterators.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/CoreIterators.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/CoreIterators.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/CoreIterators.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/DynamicSparseMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/DynamicSparseMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/DynamicSparseMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/DynamicSparseMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/MappedSparseMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/MappedSparseMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/MappedSparseMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/MappedSparseMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseAssign.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseAssign.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseAssign.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseAssign.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseBlock.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseBlock.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseBlock.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseBlock.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseCwiseBinaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseCwiseBinaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseCwiseBinaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseCwiseBinaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseCwiseUnaryOp.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseCwiseUnaryOp.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseCwiseUnaryOp.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseCwiseUnaryOp.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDenseProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDenseProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDenseProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDenseProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDiagonalProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDiagonalProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDiagonalProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDiagonalProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDot.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDot.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseDot.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseDot.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseFuzzy.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseFuzzy.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseFuzzy.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseFuzzy.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseMatrix.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseMatrix.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseMatrix.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseMatrixBase.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseMatrixBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseMatrixBase.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseMatrixBase.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseRedux.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseRedux.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseRedux.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseRedux.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseSelfAdjointView.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseSelfAdjointView.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseSelfAdjointView.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseSelfAdjointView.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseSparseProduct.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseSparseProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseSparseProduct.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseSparseProduct.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseTranspose.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseTranspose.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseTranspose.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseTranspose.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseTriangularView.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseTriangularView.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseTriangularView.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseTriangularView.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseUtil.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseUtil.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseUtil.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseUtil.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseVector.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/SparseView.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseView.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/SparseView.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/SparseView.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/Sparse/TriangularSolver.h b/uppsrc/plugin/Eigen/Eigen/src/Sparse/TriangularSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/Sparse/TriangularSolver.h
rename to uppsrc/plugin/Eigen/Eigen/src/Sparse/TriangularSolver.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/StlSupport/StdDeque.h b/uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdDeque.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/StlSupport/StdDeque.h
rename to uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdDeque.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/StlSupport/StdList.h b/uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdList.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/StlSupport/StdList.h
rename to uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdList.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/StlSupport/StdVector.h b/uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/StlSupport/StdVector.h
rename to uppsrc/plugin/Eigen/Eigen/src/StlSupport/StdVector.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/StlSupport/details.h b/uppsrc/plugin/Eigen/Eigen/src/StlSupport/details.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/StlSupport/details.h
rename to uppsrc/plugin/Eigen/Eigen/src/StlSupport/details.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/misc/Image.h b/uppsrc/plugin/Eigen/Eigen/src/misc/Image.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/misc/Image.h
rename to uppsrc/plugin/Eigen/Eigen/src/misc/Image.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/misc/Kernel.h b/uppsrc/plugin/Eigen/Eigen/src/misc/Kernel.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/misc/Kernel.h
rename to uppsrc/plugin/Eigen/Eigen/src/misc/Kernel.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/misc/Solve.h b/uppsrc/plugin/Eigen/Eigen/src/misc/Solve.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/misc/Solve.h
rename to uppsrc/plugin/Eigen/Eigen/src/misc/Solve.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/ArrayCwiseBinaryOps.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/ArrayCwiseUnaryOps.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/BlockMethods.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/BlockMethods.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/BlockMethods.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/BlockMethods.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/CommonCwiseBinaryOps.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/CommonCwiseUnaryOps.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/MatrixCwiseBinaryOps.h
diff --git a/bazaar/plugin/Eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h b/uppsrc/plugin/Eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h
similarity index 100%
rename from bazaar/plugin/Eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h
rename to uppsrc/plugin/Eigen/Eigen/src/plugins/MatrixCwiseUnaryOps.h
diff --git a/bazaar/plugin/Eigen/ToStringPlugin.h b/uppsrc/plugin/Eigen/ToStringPlugin.h
similarity index 100%
rename from bazaar/plugin/Eigen/ToStringPlugin.h
rename to uppsrc/plugin/Eigen/ToStringPlugin.h
diff --git a/bazaar/plugin/Eigen/init b/uppsrc/plugin/Eigen/init
similarity index 100%
rename from bazaar/plugin/Eigen/init
rename to uppsrc/plugin/Eigen/init
diff --git a/bazaar/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp b/uppsrc/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp
similarity index 100%
rename from bazaar/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp
rename to uppsrc/plugin/Eigen/srcdoc.tpp/Eigen$en-us.tpp
diff --git a/bazaar/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp b/uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp
similarity index 100%
rename from bazaar/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp
rename to uppsrc/plugin/Eigen/srcdoc.tpp/NonLinear$en-us.tpp
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/AdolcForward b/uppsrc/plugin/Eigen/unsupported/Eigen/AdolcForward
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/AdolcForward
rename to uppsrc/plugin/Eigen/unsupported/Eigen/AdolcForward
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/AlignedVector3 b/uppsrc/plugin/Eigen/unsupported/Eigen/AlignedVector3
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/AlignedVector3
rename to uppsrc/plugin/Eigen/unsupported/Eigen/AlignedVector3
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/AutoDiff b/uppsrc/plugin/Eigen/unsupported/Eigen/AutoDiff
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/AutoDiff
rename to uppsrc/plugin/Eigen/unsupported/Eigen/AutoDiff
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/BVH b/uppsrc/plugin/Eigen/unsupported/Eigen/BVH
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/BVH
rename to uppsrc/plugin/Eigen/unsupported/Eigen/BVH
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/CholmodSupport b/uppsrc/plugin/Eigen/unsupported/Eigen/CholmodSupport
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/CholmodSupport
rename to uppsrc/plugin/Eigen/unsupported/Eigen/CholmodSupport
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/FFT b/uppsrc/plugin/Eigen/unsupported/Eigen/FFT
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/FFT
rename to uppsrc/plugin/Eigen/unsupported/Eigen/FFT
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/IterativeSolvers b/uppsrc/plugin/Eigen/unsupported/Eigen/IterativeSolvers
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/IterativeSolvers
rename to uppsrc/plugin/Eigen/unsupported/Eigen/IterativeSolvers
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/MPRealSupport b/uppsrc/plugin/Eigen/unsupported/Eigen/MPRealSupport
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/MPRealSupport
rename to uppsrc/plugin/Eigen/unsupported/Eigen/MPRealSupport
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/MatrixFunctions b/uppsrc/plugin/Eigen/unsupported/Eigen/MatrixFunctions
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/MatrixFunctions
rename to uppsrc/plugin/Eigen/unsupported/Eigen/MatrixFunctions
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/MoreVectorization b/uppsrc/plugin/Eigen/unsupported/Eigen/MoreVectorization
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/MoreVectorization
rename to uppsrc/plugin/Eigen/unsupported/Eigen/MoreVectorization
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/NonLinearOptimization b/uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/NonLinearOptimization
rename to uppsrc/plugin/Eigen/unsupported/Eigen/NonLinearOptimization
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/NumericalDiff b/uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/NumericalDiff
rename to uppsrc/plugin/Eigen/unsupported/Eigen/NumericalDiff
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/OpenGLSupport b/uppsrc/plugin/Eigen/unsupported/Eigen/OpenGLSupport
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/OpenGLSupport
rename to uppsrc/plugin/Eigen/unsupported/Eigen/OpenGLSupport
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/Polynomials b/uppsrc/plugin/Eigen/unsupported/Eigen/Polynomials
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/Polynomials
rename to uppsrc/plugin/Eigen/unsupported/Eigen/Polynomials
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/Skyline b/uppsrc/plugin/Eigen/unsupported/Eigen/Skyline
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/Skyline
rename to uppsrc/plugin/Eigen/unsupported/Eigen/Skyline
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/SparseExtra b/uppsrc/plugin/Eigen/unsupported/Eigen/SparseExtra
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/SparseExtra
rename to uppsrc/plugin/Eigen/unsupported/Eigen/SparseExtra
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/SuperLUSupport b/uppsrc/plugin/Eigen/unsupported/Eigen/SuperLUSupport
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/SuperLUSupport
rename to uppsrc/plugin/Eigen/unsupported/Eigen/SuperLUSupport
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/UmfPackSupport b/uppsrc/plugin/Eigen/unsupported/Eigen/UmfPackSupport
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/UmfPackSupport
rename to uppsrc/plugin/Eigen/unsupported/Eigen/UmfPackSupport
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/BVH/BVAlgorithms.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/BVH/BVAlgorithms.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/BVH/BVAlgorithms.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/BVH/BVAlgorithms.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/BVH/KdBVH.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/BVH/KdBVH.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/BVH/KdBVH.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/BVH/KdBVH.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/FFT/ei_fftw_impl.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/FFT/ei_fftw_impl.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/FFT/ei_fftw_impl.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/FFT/ei_fftw_impl.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/FFT/ei_kissfft_impl.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/FFT/ei_kissfft_impl.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/FFT/ei_kissfft_impl.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/FFT/ei_kissfft_impl.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/IterationController.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/IterationController.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/IterativeSolvers/IterationController.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunction.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunctionAtomic.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunctionAtomic.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunctionAtomic.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/MatrixFunctionAtomic.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/StemFunction.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/StemFunction.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/StemFunction.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/MatrixFunctions/StemFunction.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/MoreVectorization/MathFunctions.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/MoreVectorization/MathFunctions.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/MoreVectorization/MathFunctions.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/MoreVectorization/MathFunctions.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/LevenbergMarquardt.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/chkder.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/chkder.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/chkder.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/chkder.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/covar.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/covar.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/covar.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/covar.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/dogleg.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/dogleg.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/fdjac1.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/lmpar.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/lmpar.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1updt.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/NumericalDiff/NumericalDiff.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/Companion.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/Companion.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/Companion.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/Companion.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialSolver.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialSolver.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialSolver.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialSolver.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialUtils.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialUtils.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialUtils.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Polynomials/PolynomialUtils.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineInplaceLU.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrix.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrix.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrix.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrix.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineMatrixBase.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineProduct.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineProduct.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineProduct.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineProduct.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineStorage.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineStorage.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineStorage.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineStorage.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineUtil.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineUtil.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineUtil.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/Skyline/SkylineUtil.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Amd.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Amd.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Amd.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Amd.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupport.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupport.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupport.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupport.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupportLegacy.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupportLegacy.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupportLegacy.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/CholmodSupportLegacy.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/RandomSetter.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/RandomSetter.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/RandomSetter.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/RandomSetter.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SimplicialCholesky.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SimplicialCholesky.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SimplicialCholesky.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SimplicialCholesky.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Solve.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Solve.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Solve.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/Solve.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLDLTLegacy.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLDLTLegacy.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLDLTLegacy.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLDLTLegacy.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLLT.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLLT.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLLT.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLLT.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLU.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLU.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLU.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SparseLU.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SuperLUSupport.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SuperLUSupport.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SuperLUSupport.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/SuperLUSupport.h
diff --git a/bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h b/uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h
rename to uppsrc/plugin/Eigen/unsupported/Eigen/src/SparseExtra/UmfPackSupport.h
diff --git a/bazaar/plugin/Eigen/unsupported/README.txt b/uppsrc/plugin/Eigen/unsupported/README.txt
similarity index 100%
rename from bazaar/plugin/Eigen/unsupported/README.txt
rename to uppsrc/plugin/Eigen/unsupported/README.txt
diff --git a/upptst/MtDraw/main.cpp b/upptst/MtDraw/main.cpp
index 4b4005a53..203976216 100644
--- a/upptst/MtDraw/main.cpp
+++ b/upptst/MtDraw/main.cpp
@@ -20,7 +20,7 @@ void MyApp::Do(int i)
 {
 	String qtf;
 	qtf << "Here goes Image "
-	    << "@@iml:" << Random(100) * 10 + 100 << "*" << Random(150) * 10 + 100 << "`CtrlImg:exclamation` !!!"
+//	    << "@@iml:" << Random(100) * 10 + 100 << "*" << Random(150) * 10 + 100 << "`CtrlImg:exclamation` !!!"
 	    << "&This was pass: " << i;
 	if(i & 1) {
 		RLOG("About to lock, main: " << Thread::IsMain());