--- a/include/kdtree.h	Tue Dec 04 08:58:05 2007 +0100
+++ b/include/kdtree.h	Wed Dec 05 18:54:23 2007 +0100
@@ -1,33 +1,15 @@
 #ifndef KDTREE_H
 #define KDTREE_H
 
-#include <vector>
 #include <iostream>
 #include <fstream>
 
+#include "container.h"
+#include "vector.h"
 #include "scene.h"
 
 using namespace std;
 
-class ShapeList: public vector<Shape*>
-{
-};
-
-class Container
-{
-protected:
-	BBox bbox;
-public:
-	ShapeList shapes;
-	Container(): bbox(), shapes() {};
-	virtual ~Container() {};
-	virtual void addShape(Shape* aShape);
-	//void addShapeNoExtend(Shape* aShape) { shapes.push_back(aShape); };
-	virtual Shape *nearest_intersection(const Shape *origin_shape, const Ray &ray,
-		Float &nearest_distance);
-	virtual void optimize() {};
-};
-
 class KdNode
 {
 	Float split;