diff --git a/example/src/ofApp.cpp b/example/src/ofApp.cpp
index 2cab8a6..18e5777 100755
--- a/example/src/ofApp.cpp
+++ b/example/src/ofApp.cpp
@@ -85,10 +85,10 @@ void ofApp::keyPressed(int key)
 	cout << "Key pressed: " << static_cast<char>(key) << endl;
     
     switch (key) {
-        case '1': gui.setMode(ofxGuiMode::NONE); break;
-        case '2': gui.setMode(ofxGuiMode::TEXTURE_MAPPING); break;
-        case '3': gui.setMode(ofxGuiMode::PROJECTION_MAPPING); break;
-        case '4': gui.setMode(ofxGuiMode::SOURCE_SELECTION); break;
+        case '1': gui.setMode(ofx::piMapper::GuiMode::NONE); break;
+        case '2': gui.setMode(ofx::piMapper::GuiMode::TEXTURE_MAPPING); break;
+        case '3': gui.setMode(ofx::piMapper::GuiMode::PROJECTION_MAPPING); break;
+        case '4': gui.setMode(ofx::piMapper::GuiMode::SOURCE_SELECTION); break;
         case 'i': bShowInfo = !bShowInfo; break;
         case 'r': addRandomSurface(); break;
         case 'q': addQuadSurface(); break;
@@ -103,7 +103,7 @@ void ofApp::keyPressed(int key)
 
 void ofApp::addRandomSurface()
 {
-    int surfaceType = ofxSurfaceType::TRIANGLE_SURFACE;
+    int surfaceType = ofx::piMapper::SurfaceType::TRIANGLE_SURFACE;
     vector<ofVec2f> vertices;
     vertices.push_back( ofVec2f( ofRandomWidth(), ofRandomHeight() ) );
     vertices.push_back( ofVec2f( ofRandomWidth(), ofRandomHeight() ) );
@@ -120,7 +120,7 @@ void ofApp::addRandomSurface()
 
 void ofApp::addQuadSurface()
 {
-    int surfaceType = ofxSurfaceType::QUAD_SURFACE;
+    int surfaceType = ofx::piMapper::SurfaceType::QUAD_SURFACE;
     vector<ofVec2f> vertices;
 
     int border = 50;
@@ -143,7 +143,7 @@ void ofApp::addQuadSurface()
 
 void ofApp::addSurface()
 {
-    int surfaceType = ofxSurfaceType::TRIANGLE_SURFACE;
+    int surfaceType = ofx::piMapper::SurfaceType::TRIANGLE_SURFACE;
     vector<ofVec2f> vertices;
     vertices.push_back( ofVec2f( (float)ofGetWidth()/2.0f, 0.0f ) );
     vertices.push_back( ofVec2f( (float)ofGetWidth(), (float)ofGetHeight() ) );
diff --git a/example/src/ofApp.h b/example/src/ofApp.h
index 05d7a8f..10c1c99 100755
--- a/example/src/ofApp.h
+++ b/example/src/ofApp.h
@@ -1,5 +1,4 @@
-#ifndef H_OF_APP
-#define H_OF_APP
+#pragma once
 
 #include "ofMain.h"
 #include "ofxPiMapper.h"
@@ -20,12 +19,10 @@ public:
     void setFboAsTexture();
     
     ofImage image;
-    ofxSurfaceManager surfaceManager;
-    ofxSurfaceManagerGui gui;
+    ofx::piMapper::SurfaceManager surfaceManager;
+    ofx::piMapper::SurfaceManagerGui gui;
     bool bShowInfo;
     ofFbo* fbo;    
     vector<ofRectangle> rects;
     vector<float> rectSpeeds;
-};
-
-#endif
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/BaseJoint.cpp b/src/BaseJoint.cpp
index 22d147d..19c490a 100644
--- a/src/BaseJoint.cpp
+++ b/src/BaseJoint.cpp
@@ -1,30 +1,33 @@
-#include "ofxBaseJoint.h"
+#include "BaseJoint.h"
 
-ofxBaseJoint::ofxBaseJoint()
+namespace ofx{
+namespace piMapper{
+    
+BaseJoint::BaseJoint()
 {
     setDefaultColors();
     setDefaultProperties();
     registerMouseEvents();
 }
 
-ofxBaseJoint::~ofxBaseJoint()
+BaseJoint::~BaseJoint()
 {
     unregisterMouseEvents();
 }
 
-void ofxBaseJoint::registerMouseEvents()
+void BaseJoint::registerMouseEvents()
 {
-    ofAddListener(ofEvents().mousePressed, this, &ofxBaseJoint::mousePressed);
-    ofAddListener(ofEvents().mouseDragged, this, &ofxBaseJoint::mouseDragged);
+    ofAddListener(ofEvents().mousePressed, this, &BaseJoint::mousePressed);
+    ofAddListener(ofEvents().mouseDragged, this, &BaseJoint::mouseDragged);
 }
 
-void ofxBaseJoint::unregisterMouseEvents()
+void BaseJoint::unregisterMouseEvents()
 {
-    ofRemoveListener(ofEvents().mousePressed, this, &ofxBaseJoint::mousePressed);
-    ofRemoveListener(ofEvents().mouseDragged, this, &ofxBaseJoint::mouseDragged);
+    ofRemoveListener(ofEvents().mousePressed, this, &BaseJoint::mousePressed);
+    ofRemoveListener(ofEvents().mouseDragged, this, &BaseJoint::mouseDragged);
 }
 
-void ofxBaseJoint::mousePressed(ofMouseEventArgs& args)
+void BaseJoint::mousePressed(ofMouseEventArgs& args)
 {
     if ( hitTest(ofVec2f(args.x, args.y)) ) {
         //selected = true;
@@ -33,53 +36,53 @@ void ofxBaseJoint::mousePressed(ofMouseEventArgs& args)
     }
 }
 
-void ofxBaseJoint::mouseReleased(int x, int y, int button)
+void BaseJoint::mouseReleased(int x, int y, int button)
 {
     stopDrag();
 }
 
-void ofxBaseJoint::mouseDragged(ofMouseEventArgs& args)
+void BaseJoint::mouseDragged(ofMouseEventArgs& args)
 {
     if ( !bDrag ) return;
     position = ofVec2f(args.x, args.y) + clickDistance;
 }
 
-void ofxBaseJoint::startDrag()
+void BaseJoint::startDrag()
 {
     bDrag = true;
 }
 
-void ofxBaseJoint::stopDrag()
+void BaseJoint::stopDrag()
 {
     bDrag = false;
 }
 
-void ofxBaseJoint::select()
+void BaseJoint::select()
 {
     selected = true;
 }
 
-void ofxBaseJoint::unselect()
+void BaseJoint::unselect()
 {
     selected = false;
 }
 
-void ofxBaseJoint::setClickDistance(ofVec2f newClickDistance)
+void BaseJoint::setClickDistance(ofVec2f newClickDistance)
 {
     clickDistance = newClickDistance;
 }
 
-bool ofxBaseJoint::isDragged()
+bool BaseJoint::isDragged()
 {
     return bDrag;
 }
 
-bool ofxBaseJoint::isSelected()
+bool BaseJoint::isSelected()
 {
     return selected;
 }
 
-void ofxBaseJoint::setDefaultColors()
+void BaseJoint::setDefaultColors()
 {
     fillColor = ofColor(0, 255, 255, 0);
     strokeColor = ofColor(255, 255, 255);
@@ -87,7 +90,7 @@ void ofxBaseJoint::setDefaultColors()
     strokeColorSelected = ofColor(255, 0, 0);
 }
 
-void ofxBaseJoint::setDefaultProperties()
+void BaseJoint::setDefaultProperties()
 {
     enabled = true;
     visible = true;
@@ -96,4 +99,6 @@ void ofxBaseJoint::setDefaultProperties()
     bDrag = false;
     selected = false;
     strokeWidth = 1.5f;
-}
\ No newline at end of file
+}
+    
+}}
\ No newline at end of file
diff --git a/src/BaseJoint.h b/src/BaseJoint.h
index d3decb7..5e5824d 100644
--- a/src/BaseJoint.h
+++ b/src/BaseJoint.h
@@ -1,48 +1,50 @@
-#ifndef H_OFX_BASE_JOINT
-#define H_OFX_BASE_JOINT
+#pragma once
 
 #include "ofMain.h"
 
-class ofxBaseJoint {
-public:
-    ofxBaseJoint();
-    ~ofxBaseJoint();
+namespace ofx{
+namespace piMapper{
     
-    void registerMouseEvents();
-    void unregisterMouseEvents();
-    
-    ofVec2f position;
-    bool enabled;
-    bool visible;
-    bool selected;
-    
-    void mousePressed(ofMouseEventArgs& args);
-    void mouseReleased(int x, int y, int button);
-    void mouseDragged(ofMouseEventArgs& args);
-    void startDrag();
-    void stopDrag();
-    void select();
-    void unselect();
-    void setClickDistance(ofVec2f newClickDistance);
-    bool isDragged();
-    bool isSelected();
-    
-    virtual void update(){};
-    virtual void draw(){};
-    virtual bool hitTest(ofVec2f position){};
-    
-protected:
-    ofColor fillColor;
-    ofColor strokeColor;
-    ofColor fillColorSelected;
-    ofColor strokeColorSelected;
-    float strokeWidth;
-    ofVec2f clickDistance; // How far from the center of the joint the user has clicked?
-    bool bDrag;
-    
-private:
-    void setDefaultColors();
-    void setDefaultProperties();
-};
-
-#endif
+    class BaseJoint {
+    public:
+        BaseJoint();
+        ~BaseJoint();
+        
+        void registerMouseEvents();
+        void unregisterMouseEvents();
+        
+        ofVec2f position;
+        bool enabled;
+        bool visible;
+        bool selected;
+        
+        void mousePressed(ofMouseEventArgs& args);
+        void mouseReleased(int x, int y, int button);
+        void mouseDragged(ofMouseEventArgs& args);
+        void startDrag();
+        void stopDrag();
+        void select();
+        void unselect();
+        void setClickDistance(ofVec2f newClickDistance);
+        bool isDragged();
+        bool isSelected();
+        
+        virtual void update(){};
+        virtual void draw(){};
+        virtual bool hitTest(ofVec2f position){};
+        
+    protected:
+        ofColor fillColor;
+        ofColor strokeColor;
+        ofColor fillColorSelected;
+        ofColor strokeColorSelected;
+        float strokeWidth;
+        ofVec2f clickDistance; // How far from the center of the joint the user has clicked?
+        bool bDrag;
+        
+    private:
+        void setDefaultColors();
+        void setDefaultProperties();
+    };
+}
+}
diff --git a/src/BaseSurface.cpp b/src/BaseSurface.cpp
index 67db7ef..7350b29 100644
--- a/src/BaseSurface.cpp
+++ b/src/BaseSurface.cpp
@@ -1,12 +1,15 @@
-#include "ofxBaseSurface.h"
+#include "BaseSurface.h"
 
-ofxBaseSurface::ofxBaseSurface()
+namespace ofx{
+namespace piMapper{
+
+BaseSurface::BaseSurface()
 {
     ofEnableNormalizedTexCoords();
     createDefaultTexture();
 }
 
-void ofxBaseSurface::createDefaultTexture()
+void BaseSurface::createDefaultTexture()
 {
     ofPixels pixels;
     pixels.allocate(500, 500, 1);
@@ -38,7 +41,7 @@ void ofxBaseSurface::createDefaultTexture()
     texture = &defaultTexture;
 }
 
-void ofxBaseSurface::drawTexture(ofVec2f position)
+void BaseSurface::drawTexture(ofVec2f position)
 {
     ofMesh texMesh;
     texMesh.addVertex(position);
@@ -56,17 +59,19 @@ void ofxBaseSurface::drawTexture(ofVec2f position)
     texture->unbind();
 }
 
-void ofxBaseSurface::setTexture(ofTexture *texturePtr)
+void BaseSurface::setTexture(ofTexture *texturePtr)
 {
     texture = texturePtr;
 }
 
-ofTexture* ofxBaseSurface::getTexture()
+ofTexture* BaseSurface::getTexture()
 {
     return texture;
 }
 
-ofTexture* ofxBaseSurface::getDefaultTexture()
+ofTexture* BaseSurface::getDefaultTexture()
 {
     return &defaultTexture;
-}
\ No newline at end of file
+}
+
+}}
\ No newline at end of file
diff --git a/src/BaseSurface.h b/src/BaseSurface.h
index 9cd98b6..e8e5b8f 100644
--- a/src/BaseSurface.h
+++ b/src/BaseSurface.h
@@ -1,15 +1,16 @@
-#ifndef H_OFX_BASE_SURFACE
-#define H_OFX_BASE_SURFACE
+#pragma once
 
 #include "ofMain.h"
 #include <string>
 
 using namespace std;
 
-class ofxBaseSurface
+namespace ofx{
+    namespace piMapper{
+class BaseSurface
 {
 public:
-    ofxBaseSurface();
+    BaseSurface();
     virtual void setup(){};
     virtual void draw(){};
     virtual void setVertex(int index, ofVec2f p){};
@@ -37,4 +38,4 @@ protected:
     void createDefaultTexture();
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/CircleJoint.cpp b/src/CircleJoint.cpp
index 4abbc5c..938659f 100644
--- a/src/CircleJoint.cpp
+++ b/src/CircleJoint.cpp
@@ -1,16 +1,19 @@
-#include "ofxCircleJoint.h"
+#include "CircleJoint.h"
 
-ofxCircleJoint::ofxCircleJoint()
+namespace ofx{
+namespace piMapper{
+
+CircleJoint::CircleJoint()
 {
     setDefaultProperties();
 }
 
-void ofxCircleJoint::update()
+void CircleJoint::update()
 {
     if (!enabled) return;
 }
 
-void ofxCircleJoint::draw()
+void CircleJoint::draw()
 {
     if (!visible) return;
     if (!enabled) return;
@@ -38,14 +41,16 @@ void ofxCircleJoint::draw()
     ofPopStyle();
 }
 
-void ofxCircleJoint::setDefaultProperties()
+void CircleJoint::setDefaultProperties()
 {
     radius = 10.0f;
 }
 
-bool ofxCircleJoint::hitTest(ofVec2f pos)
+bool CircleJoint::hitTest(ofVec2f pos)
 {
     float distance = position.distance(pos);
     if ( distance < radius ) return true;
     else return false;
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/CircleJoint.h b/src/CircleJoint.h
index f3016e9..812bc3c 100644
--- a/src/CircleJoint.h
+++ b/src/CircleJoint.h
@@ -1,13 +1,15 @@
-#ifndef H_OFX_CIRCLE_JOINT
-#define H_OFX_CIRCLE_JOINT
+#pragma once
 
 #include "ofMain.h"
-#include "ofxBaseJoint.h"
+#include "BaseJoint.h"
 
-class ofxCircleJoint : public ofxBaseJoint
+
+namespace ofx{
+namespace piMapper{
+class CircleJoint : public BaseJoint
 {
 public:
-    ofxCircleJoint();
+    CircleJoint();
     
     void update();
     void draw();
@@ -18,5 +20,4 @@ private:
     
     void setDefaultProperties();
 };
-
-#endif
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/src/EditorType.h b/src/EditorType.h
index cc0c1c8..af5650b 100644
--- a/src/EditorType.h
+++ b/src/EditorType.h
@@ -1,7 +1,8 @@
-#ifndef H_OFX_EDITOR_TYPE
-#define H_OFX_EDITOR_TYPE
+#pragma once
 
-struct ofxEditorType
+namespace ofx{
+   namespace piMapper{
+struct EditorType
 {
     enum {
         TEXTURE,
@@ -9,4 +10,4 @@ struct ofxEditorType
     };
 };
 
-#endif
\ No newline at end of file
+}}
\ No newline at end of file
diff --git a/src/GuiMode.h b/src/GuiMode.h
index c60fe71..4c65a74 100644
--- a/src/GuiMode.h
+++ b/src/GuiMode.h
@@ -1,7 +1,8 @@
-#ifndef H_OFX_GUI_MODE
-#define H_OFX_GUI_MODE
+#pragma once
 
-struct ofxGuiMode
+namespace ofx{
+    namespace piMapper{
+struct GuiMode
 {
     enum {
         NONE,
@@ -10,5 +11,4 @@ struct ofxGuiMode
         SOURCE_SELECTION
     };
 };
-
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/ProjectionEditor.cpp b/src/ProjectionEditor.cpp
index 7560ba8..12adcca 100644
--- a/src/ProjectionEditor.cpp
+++ b/src/ProjectionEditor.cpp
@@ -1,6 +1,8 @@
-#include "ofxProjectionEditor.h"
+#include "ProjectionEditor.h"
 
-ofxProjectionEditor::ofxProjectionEditor()
+namespace ofx{
+    namespace piMapper{
+ProjectionEditor::ProjectionEditor()
 {
     surfaceManager = NULL;
     bShiftKeyDown = false;
@@ -8,62 +10,62 @@ ofxProjectionEditor::ofxProjectionEditor()
     enable();
 }
 
-ofxProjectionEditor::~ofxProjectionEditor()
+ProjectionEditor::~ProjectionEditor()
 {
     clearJoints();
     surfaceManager = NULL;
     disable();
 }
 
-void ofxProjectionEditor::registerAppEvents()
+void ProjectionEditor::registerAppEvents()
 {
-    ofAddListener(ofEvents().update, this, &ofxProjectionEditor::update);
-    ofAddListener(ofEvents().messageEvent, this, &ofxProjectionEditor::gotMessage);
+    ofAddListener(ofEvents().update, this, &ProjectionEditor::update);
+    ofAddListener(ofEvents().messageEvent, this, &ProjectionEditor::gotMessage);
 }
 
-void ofxProjectionEditor::unregisterAppEvents()
+void ProjectionEditor::unregisterAppEvents()
 {
-    ofRemoveListener(ofEvents().update, this, &ofxProjectionEditor::update);
-    ofRemoveListener(ofEvents().messageEvent, this, &ofxProjectionEditor::gotMessage);
+    ofRemoveListener(ofEvents().update, this, &ProjectionEditor::update);
+    ofRemoveListener(ofEvents().messageEvent, this, &ProjectionEditor::gotMessage);
 }
 
-void ofxProjectionEditor::registerMouseEvents()
+void ProjectionEditor::registerMouseEvents()
 {
-    ofAddListener(ofEvents().mouseDragged, this, &ofxProjectionEditor::mouseDragged);
+    ofAddListener(ofEvents().mouseDragged, this, &ProjectionEditor::mouseDragged);
 }
 
-void ofxProjectionEditor::unregisterMouseEvents()
+void ProjectionEditor::unregisterMouseEvents()
 {
-    ofRemoveListener(ofEvents().mouseDragged, this, &ofxProjectionEditor::mouseDragged);
+    ofRemoveListener(ofEvents().mouseDragged, this, &ProjectionEditor::mouseDragged);
 }
 
-void ofxProjectionEditor::registerKeyEvents()
+void ProjectionEditor::registerKeyEvents()
 {
-    ofAddListener(ofEvents().keyPressed, this, &ofxProjectionEditor::keyPressed);
-    ofAddListener(ofEvents().keyReleased, this, &ofxProjectionEditor::keyReleased);
+    ofAddListener(ofEvents().keyPressed, this, &ProjectionEditor::keyPressed);
+    ofAddListener(ofEvents().keyReleased, this, &ProjectionEditor::keyReleased);
 }
 
-void ofxProjectionEditor::unregisterKeyEvents()
+void ProjectionEditor::unregisterKeyEvents()
 {
-    ofRemoveListener(ofEvents().keyPressed, this, &ofxProjectionEditor::keyPressed);
-    ofRemoveListener(ofEvents().keyReleased, this, &ofxProjectionEditor::keyReleased);
+    ofRemoveListener(ofEvents().keyPressed, this, &ProjectionEditor::keyPressed);
+    ofRemoveListener(ofEvents().keyReleased, this, &ProjectionEditor::keyReleased);
 }
 
-void ofxProjectionEditor::enable()
+void ProjectionEditor::enable()
 {
     registerAppEvents();
     registerMouseEvents();
     registerKeyEvents();
 }
 
-void ofxProjectionEditor::disable()
+void ProjectionEditor::disable()
 {
     unregisterAppEvents();
     unregisterMouseEvents();
     unregisterKeyEvents();
 }
 
-void ofxProjectionEditor::update(ofEventArgs &args)
+void ProjectionEditor::update(ofEventArgs &args)
 {
     // update surface if one of the joints is being dragged
     for ( int i=0; i<joints.size(); i++ ) {
@@ -83,7 +85,7 @@ void ofxProjectionEditor::update(ofEventArgs &args)
     }
 }
 
-void ofxProjectionEditor::draw()
+void ProjectionEditor::draw()
 {
     if ( surfaceManager == NULL ) return;
     if ( surfaceManager->getSelectedSurface() == NULL ) return;
@@ -91,14 +93,14 @@ void ofxProjectionEditor::draw()
     drawJoints();
 }
 
-void ofxProjectionEditor::mouseDragged(ofMouseEventArgs &args)
+void ProjectionEditor::mouseDragged(ofMouseEventArgs &args)
 {
     ofVec2f mousePosition = ofVec2f(args.x, args.y);
     
     // Collect all vertices of the projection surfaces
     vector<ofVec3f*> allVertices;
     for ( int i=0; i<surfaceManager->size(); i++ ) {
-        ofxBaseSurface* surface = surfaceManager->getSurface(i);
+        BaseSurface* surface = surfaceManager->getSurface(i);
         if ( surface == surfaceManager->getSelectedSurface() ) {
             continue; // Don't add vertices of selected surface
         }
@@ -125,7 +127,7 @@ void ofxProjectionEditor::mouseDragged(ofMouseEventArgs &args)
     }
 }
 
-void ofxProjectionEditor::keyPressed(ofKeyEventArgs &args)
+void ProjectionEditor::keyPressed(ofKeyEventArgs &args)
 {
     int key = args.key;
     float moveStep;
@@ -142,7 +144,7 @@ void ofxProjectionEditor::keyPressed(ofKeyEventArgs &args)
     }
 }
 
-void ofxProjectionEditor::keyReleased(ofKeyEventArgs &args)
+void ProjectionEditor::keyReleased(ofKeyEventArgs &args)
 {
     int key = args.key;
     switch (key) {
@@ -150,7 +152,7 @@ void ofxProjectionEditor::keyReleased(ofKeyEventArgs &args)
     }
 }
 
-void ofxProjectionEditor::gotMessage(ofMessage& msg)
+void ProjectionEditor::gotMessage(ofMessage& msg)
 {
     if (msg.message == "surfaceSelected") {
         // refresh gui
@@ -159,12 +161,12 @@ void ofxProjectionEditor::gotMessage(ofMessage& msg)
     }
 }
 
-void ofxProjectionEditor::setSurfaceManager(ofxSurfaceManager *newSurfaceManager)
+void ProjectionEditor::setSurfaceManager(SurfaceManager *newSurfaceManager)
 {
     surfaceManager = newSurfaceManager;
 }
 
-void ofxProjectionEditor::clearJoints()
+void ProjectionEditor::clearJoints()
 {
     while ( joints.size() ) {
         delete joints.back();
@@ -172,7 +174,7 @@ void ofxProjectionEditor::clearJoints()
     }
 }
 
-void ofxProjectionEditor::createJoints()
+void ProjectionEditor::createJoints()
 {
     if ( surfaceManager == NULL ) return;
     clearJoints();
@@ -185,12 +187,12 @@ void ofxProjectionEditor::createJoints()
     vector<ofVec3f>& vertices = surfaceManager->getSelectedSurface()->getVertices();
     
     for ( int i=0; i<vertices.size(); i++ ) {
-        joints.push_back( new ofxCircleJoint() );
+        joints.push_back( new CircleJoint() );
         joints.back()->position = ofVec2f(vertices[i].x, vertices[i].y);
     }
 }
 
-void ofxProjectionEditor::updateJoints()
+void ProjectionEditor::updateJoints()
 {
     vector<ofVec3f>& vertices = surfaceManager->getSelectedSurface()->getVertices();
     for ( int i=0; i<vertices.size(); i++ ) {
@@ -198,14 +200,14 @@ void ofxProjectionEditor::updateJoints()
     }
 }
 
-void ofxProjectionEditor::unselectAllJoints()
+void ProjectionEditor::unselectAllJoints()
 {
     for ( int i=0; i<joints.size(); i++ ) {
         joints[i]->unselect();
     }
 }
 
-void ofxProjectionEditor::moveSelectedSurface(ofVec2f by)
+void ProjectionEditor::moveSelectedSurface(ofVec2f by)
 {
     if ( surfaceManager == NULL ) return;
     if ( surfaceManager->getSelectedSurface() == NULL ) return;
@@ -217,18 +219,18 @@ void ofxProjectionEditor::moveSelectedSurface(ofVec2f by)
     updateJoints();
 }
 
-void ofxProjectionEditor::stopDragJoints()
+void ProjectionEditor::stopDragJoints()
 {
     for (int i=0; i<joints.size(); i++){
         joints[i]->stopDrag();
     }
 }
 
-void ofxProjectionEditor::moveSelection(ofVec2f by)
+void ProjectionEditor::moveSelection(ofVec2f by)
 {
     // check if joints selected
     bool bJointSelected = false;
-    ofxBaseJoint* selectedJoint;
+    BaseJoint* selectedJoint;
     for ( int i=0; i<joints.size(); i++ ) {
         if (joints[i]->isSelected()) {
             bJointSelected = true;
@@ -244,12 +246,12 @@ void ofxProjectionEditor::moveSelection(ofVec2f by)
     }
 }
 
-void ofxProjectionEditor::setSnapDistance(float newSnapDistance)
+void ProjectionEditor::setSnapDistance(float newSnapDistance)
 {
     fSnapDistance = newSnapDistance;
 }
 
-ofxCircleJoint* ofxProjectionEditor::hitTestJoints(ofVec2f pos)
+CircleJoint* ProjectionEditor::hitTestJoints(ofVec2f pos)
 {
     for ( int i=0; i<joints.size(); i++ ) {
         if ( joints[i]->hitTest(pos) ){
@@ -259,9 +261,10 @@ ofxCircleJoint* ofxProjectionEditor::hitTestJoints(ofVec2f pos)
     return NULL;
 }
 
-void ofxProjectionEditor::drawJoints()
+void ProjectionEditor::drawJoints()
 {
     for ( int i=0; i<joints.size(); i++ ) {
         joints[i]->draw();
     }
-}
\ No newline at end of file
+}
+    }}
\ No newline at end of file
diff --git a/src/ProjectionEditor.h b/src/ProjectionEditor.h
index c4b95ec..6a7a877 100755
--- a/src/ProjectionEditor.h
+++ b/src/ProjectionEditor.h
@@ -1,14 +1,15 @@
-#ifndef H_OFX_PROJECTION_EDITOR
-#define H_OFX_PROJECTION_EDITOR
+#pragma once
 
-#include "ofxSurfaceManager.h"
-#include "ofxCircleJoint.h"
+#include "SurfaceManager.h"
+#include "CircleJoint.h"
 
-class ofxProjectionEditor
+namespace ofx{
+    namespace piMapper{
+class ProjectionEditor
 {
 public:
-    ofxProjectionEditor();
-    ~ofxProjectionEditor();
+    ProjectionEditor();
+    ~ProjectionEditor();
     
     void registerAppEvents();
     void unregisterAppEvents();
@@ -26,7 +27,7 @@ public:
     void keyPressed(ofKeyEventArgs& args);
     void keyReleased(ofKeyEventArgs& args);
     void gotMessage(ofMessage& msg);
-    void setSurfaceManager(ofxSurfaceManager* newSurfaceManager);
+    void setSurfaceManager(SurfaceManager* newSurfaceManager);
     void clearJoints();
     void createJoints();
     void updateJoints();
@@ -36,15 +37,15 @@ public:
     void updateVertices();
     void moveSelection(ofVec2f by);
     void setSnapDistance(float newSnapDistance);
-    ofxCircleJoint* hitTestJoints(ofVec2f pos);
+    CircleJoint* hitTestJoints(ofVec2f pos);
     
 private:
-    ofxSurfaceManager* surfaceManager;
-    vector<ofxCircleJoint*> joints;
+    SurfaceManager* surfaceManager;
+    vector<CircleJoint*> joints;
     bool bShiftKeyDown;
     float fSnapDistance;
     
     void drawJoints();
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/QuadSurface.cpp b/src/QuadSurface.cpp
index 91f296b..e71f45c 100644
--- a/src/QuadSurface.cpp
+++ b/src/QuadSurface.cpp
@@ -1,17 +1,19 @@
-#include "ofxQuadSurface.h"
+#include "QuadSurface.h"
 
-ofxQuadSurface::ofxQuadSurface()
+namespace ofx{
+    namespace piMapper{
+QuadSurface::QuadSurface()
 {
-	cout << "ofxQuadSurface constructor." << endl;
+	cout << "QuadSurface constructor." << endl;
     setup();
 }
 
-ofxQuadSurface::~ofxQuadSurface()
+QuadSurface::~QuadSurface()
 {
-	cout << "ofxQuadSurface destructor." << endl;
+	cout << "QuadSurface destructor." << endl;
 }
 
-void ofxQuadSurface::setup()
+void QuadSurface::setup()
 {
     // Create 4 points for the 2 triangles
     ofVec2f p1 = ofVec2f(0, 0);
@@ -28,7 +30,7 @@ void ofxQuadSurface::setup()
     setup( p1, p2, p3, p4, t1, t2, t3, t4, texture );
 }
 
-void ofxQuadSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f p4, 
+void QuadSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f p4, 
                             ofVec2f t1, ofVec2f t2, ofVec2f t3, ofVec2f t4, ofTexture* texturePtr )
 {
     // Assign texture
@@ -70,7 +72,7 @@ void ofxQuadSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f p4,
     calculate4dTextureCoords();
 }
 
-void ofxQuadSurface::draw()
+void QuadSurface::draw()
 {
     /*if(mesh.haveVertsChanged() || mesh.haveTexCoordsChanged()){
         calculate4dTextureCoords();
@@ -84,7 +86,7 @@ void ofxQuadSurface::draw()
     texture->unbind();
 }
 
-void ofxQuadSurface::setVertex(int index, ofVec2f p)
+void QuadSurface::setVertex(int index, ofVec2f p)
 {
     if ( index > 3 ) {
         ofLog() << "Vertex with this index does not exist: " << index << endl;
@@ -95,7 +97,7 @@ void ofxQuadSurface::setVertex(int index, ofVec2f p)
     calculate4dTextureCoords();
 }
 
-void ofxQuadSurface::setTexCoord(int index, ofVec2f t)
+void QuadSurface::setTexCoord(int index, ofVec2f t)
 {
     if ( index > 3 ) {
         ofLog() << "Texture coordinate with this index does not exist: " << index << endl;
@@ -106,7 +108,7 @@ void ofxQuadSurface::setTexCoord(int index, ofVec2f t)
     calculate4dTextureCoords();
 }
 
-void ofxQuadSurface::moveBy(ofVec2f v)
+void QuadSurface::moveBy(ofVec2f v)
 {
     vector<ofVec3f>& vertices = getVertices();
     for (int i=0; i<vertices.size(); i++) {
@@ -115,12 +117,12 @@ void ofxQuadSurface::moveBy(ofVec2f v)
     calculate4dTextureCoords();
 }
 
-int ofxQuadSurface::getType()
+int QuadSurface::getType()
 {
-    return ofxSurfaceType::QUAD_SURFACE;
+    return SurfaceType::QUAD_SURFACE;
 }
 
-bool ofxQuadSurface::hitTest(ofVec2f p)
+bool QuadSurface::hitTest(ofVec2f p)
 {
     // Construct ofPolyline from vertices
     ofPolyline line = getHitArea();
@@ -132,7 +134,7 @@ bool ofxQuadSurface::hitTest(ofVec2f p)
     }
 }
 
-ofVec2f ofxQuadSurface::getVertex(int index)
+ofVec2f QuadSurface::getVertex(int index)
 {
     if ( index > 3 ) {
         ofLog() << "Vertex with this index does not exist: " << index << endl;
@@ -143,7 +145,7 @@ ofVec2f ofxQuadSurface::getVertex(int index)
     return ofVec2f(vert.x, vert.y);
 }
 
-ofVec2f ofxQuadSurface::getTexCoord(int index)
+ofVec2f QuadSurface::getTexCoord(int index)
 {
     if (index > 3) {
         throw std::runtime_error("Texture coordinate index out of bounds.");
@@ -152,7 +154,7 @@ ofVec2f ofxQuadSurface::getTexCoord(int index)
     return mesh.getTexCoord(index);
 }
 
-ofPolyline ofxQuadSurface::getHitArea()
+ofPolyline QuadSurface::getHitArea()
 {
     ofPolyline line;
     line.addVertex( ofPoint( mesh.getVertex(0).x, mesh.getVertex(0).y ) );
@@ -164,7 +166,7 @@ ofPolyline ofxQuadSurface::getHitArea()
     return line;
 }
 
-ofPolyline ofxQuadSurface::getTextureHitArea()
+ofPolyline QuadSurface::getTextureHitArea()
 {
     ofPolyline line;
     vector<ofVec2f>& texCoords = mesh.getTexCoords();
@@ -177,19 +179,19 @@ ofPolyline ofxQuadSurface::getTextureHitArea()
     return line;
 }
 
-vector<ofVec3f>& ofxQuadSurface::getVertices()
+vector<ofVec3f>& QuadSurface::getVertices()
 {
     // return only joint vertices
     return mesh.getVertices();
 }
 
-vector<ofVec2f>& ofxQuadSurface::getTexCoords()
+vector<ofVec2f>& QuadSurface::getTexCoords()
 {
     
     return mesh.getTexCoords();
 }
 
-void ofxQuadSurface::calculate4dTextureCoords()
+void QuadSurface::calculate4dTextureCoords()
 {
     // Perspective Warping with OpenGL Fixed Pipeline and q coordinates
     // see:
@@ -259,4 +261,6 @@ void ofxQuadSurface::calculate4dTextureCoords()
     quadTexCoordinates[13] = t3.y * q3;
     quadTexCoordinates[15] = q3;
     
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/QuadSurface.h b/src/QuadSurface.h
index 4c6cb9d..87469cb 100755
--- a/src/QuadSurface.h
+++ b/src/QuadSurface.h
@@ -1,15 +1,16 @@
-#ifndef H_OFX_QUAD_SURFACE
-#define H_OFX_QUAD_SURFACE
+#pragma once
 
 #include "ofMain.h"
-#include "ofxBaseSurface.h"
-#include "ofxSurfaceType.h"
+#include "BaseSurface.h"
+#include "SurfaceType.h"
 
-class ofxQuadSurface : public ofxBaseSurface
+namespace ofx{
+    namespace piMapper{
+class QuadSurface : public BaseSurface
 {
 public:
-	ofxQuadSurface();
-	~ofxQuadSurface();
+	QuadSurface();
+	~QuadSurface();
     
     void setup();
 
@@ -37,4 +38,4 @@ private:
     GLfloat quadTexCoordinates[16];
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/SourcesEditor.cpp b/src/SourcesEditor.cpp
index 5b5603c..05c9a83 100644
--- a/src/SourcesEditor.cpp
+++ b/src/SourcesEditor.cpp
@@ -1,12 +1,14 @@
-#include "ofxSourcesEditor.h"
+#include "SourcesEditor.h"
 
-ofxSourcesEditor::ofxSourcesEditor()
+namespace ofx{
+    namespace piMapper{
+SourcesEditor::SourcesEditor()
 {
     defImgDir = DEFAULT_IMAGES_DIR;
     registerAppEvents();
 }
 
-ofxSourcesEditor::~ofxSourcesEditor()
+SourcesEditor::~SourcesEditor()
 {
     unregisterAppEvents();
     delete gui;
@@ -16,19 +18,19 @@ ofxSourcesEditor::~ofxSourcesEditor()
     }
 }
 
-void ofxSourcesEditor::registerAppEvents()
+void SourcesEditor::registerAppEvents()
 {
-    ofAddListener(ofEvents().setup, this, &ofxSourcesEditor::setup);
+    ofAddListener(ofEvents().setup, this, &SourcesEditor::setup);
 }
 
-void ofxSourcesEditor::unregisterAppEvents()
+void SourcesEditor::unregisterAppEvents()
 {
-    ofRemoveListener(ofEvents().setup, this, &ofxSourcesEditor::setup);
+    ofRemoveListener(ofEvents().setup, this, &SourcesEditor::setup);
 }
 
-void ofxSourcesEditor::setup(ofEventArgs& args)
+void SourcesEditor::setup(ofEventArgs& args)
 {
-    gui = new ofxRadioList();
+    gui = new RadioList();
     
     // read directory contents
     ofDirectory imgDir;
@@ -44,10 +46,10 @@ void ofxSourcesEditor::setup(ofEventArgs& args)
     
     gui->setup("Images", vnames);
     gui->setPosition(20, 20);
-    ofAddListener(gui->radioSelectedEvent, this, &ofxSourcesEditor::guiEvent);
+    ofAddListener(gui->radioSelectedEvent, this, &SourcesEditor::guiEvent);
 }
 
-void ofxSourcesEditor::draw()
+void SourcesEditor::draw()
 {
     // Don't draw if there is no source selected
     if ( surfaceManager->getSelectedSurface() == NULL ) {
@@ -57,7 +59,7 @@ void ofxSourcesEditor::draw()
     gui->draw();
 }
 
-void ofxSourcesEditor::loadImage( string name, string path )
+void SourcesEditor::loadImage( string name, string path )
 {
     images.push_back(new ofImage());
     images.back()->loadImage(path);
@@ -67,12 +69,12 @@ void ofxSourcesEditor::loadImage( string name, string path )
     ofSendMessage("imageLoaded");
 }
 
-void ofxSourcesEditor::disable()
+void SourcesEditor::disable()
 {
     gui->disable();
 }
 
-void ofxSourcesEditor::enable()
+void SourcesEditor::enable()
 {
     // Don't enable if there is no surface selected
     if ( surfaceManager->getSelectedSurface() == NULL ) {
@@ -83,12 +85,12 @@ void ofxSourcesEditor::enable()
     gui->enable();
 }
 
-void ofxSourcesEditor::setSurfaceManager(ofxSurfaceManager *newSurfaceManager)
+void SourcesEditor::setSurfaceManager(SurfaceManager *newSurfaceManager)
 {
     surfaceManager = newSurfaceManager;
 }
 
-void ofxSourcesEditor::selectImageSourceRadioButton(string name)
+void SourcesEditor::selectImageSourceRadioButton(string name)
 {
     if (name == "none") {
         gui->unselectAll();
@@ -104,12 +106,12 @@ void ofxSourcesEditor::selectImageSourceRadioButton(string name)
     }
 }
 
-int ofxSourcesEditor::getLoadedTexCount()
+int SourcesEditor::getLoadedTexCount()
 {
     return images.size();
 }
 
-ofTexture* ofxSourcesEditor::getTexture(int index)
+ofTexture* SourcesEditor::getTexture(int index)
 {
     if (index >= images.size()){
         throw std::runtime_error("Texture index out of bounds.");
@@ -118,7 +120,7 @@ ofTexture* ofxSourcesEditor::getTexture(int index)
     return &images[index]->getTextureReference();
 }
 
-void ofxSourcesEditor::guiEvent(string &imageName)
+void SourcesEditor::guiEvent(string &imageName)
 {
 	string name = imageName;
     
@@ -132,4 +134,6 @@ void ofxSourcesEditor::guiEvent(string &imageName)
     ofTexture* texture = surfaceManager->loadImageSource(name, ss.str());
     surfaceManager->getSelectedSurface()->setTexture(texture);
     surfaceManager->manageMemory();
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/SourcesEditor.h b/src/SourcesEditor.h
index 33aad38..8311d1f 100644
--- a/src/SourcesEditor.h
+++ b/src/SourcesEditor.h
@@ -1,18 +1,19 @@
-#ifndef H_OFX_SOURCES_EDITOR
-#define H_OFX_SOURCES_EDITOR
+#pragma once
 
 #include "ofGraphics.h"
 #include "ofEvents.h"
-#include "ofxSurfaceManager.h"
-#include "ofxRadioList.h"
+#include "SurfaceManager.h"
+#include "RadioList.h"
 
 #define DEFAULT_IMAGES_DIR "sources/images/";
 
-class ofxSourcesEditor
+namespace ofx{
+    namespace piMapper{
+class SourcesEditor
 {
 public:
-    ofxSourcesEditor();
-    ~ofxSourcesEditor();
+    SourcesEditor();
+    ~SourcesEditor();
     
     void registerAppEvents();
     void unregisterAppEvents();
@@ -22,19 +23,19 @@ public:
     void loadImage( string name, string path );
     void disable();
     void enable();
-    void setSurfaceManager(ofxSurfaceManager* newSurfaceManager);
+    void setSurfaceManager(SurfaceManager* newSurfaceManager);
     void selectImageSourceRadioButton(string name);
     
     int getLoadedTexCount();
     ofTexture* getTexture(int index);
     
 private:
-    ofxSurfaceManager* surfaceManager;
-    ofxRadioList* gui;
+    SurfaceManager* surfaceManager;
+    RadioList* gui;
     string defImgDir;
     void guiEvent(string &imageName);
     vector<ofImage*> images;
     vector<string> imageNames;
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/SurfaceManager.cpp b/src/SurfaceManager.cpp
index e7df328..48ac560 100644
--- a/src/SurfaceManager.cpp
+++ b/src/SurfaceManager.cpp
@@ -1,43 +1,45 @@
-#include "ofxSurfaceManager.h"
+#include "SurfaceManager.h"
 
-ofxSurfaceManager::ofxSurfaceManager()
+namespace ofx{
+    namespace piMapper{
+SurfaceManager::SurfaceManager()
 {
     
 }
 
-ofxSurfaceManager::~ofxSurfaceManager()
+SurfaceManager::~SurfaceManager()
 {
     clear();
 }
 
-void ofxSurfaceManager::draw()
+void SurfaceManager::draw()
 {
     for ( int i=0; i<surfaces.size(); i++ ) {
         surfaces[i]->draw();
     }
 }
 
-void ofxSurfaceManager::addSurface(int surfaceType)
+void SurfaceManager::addSurface(int surfaceType)
 {
-    if ( surfaceType == ofxSurfaceType::TRIANGLE_SURFACE ) {
-        surfaces.push_back( new ofxTriangleSurface() );
+    if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) {
+        surfaces.push_back( new TriangleSurface() );
     } 
-    else if (surfaceType == ofxSurfaceType::QUAD_SURFACE ) {
-        surfaces.push_back( new ofxQuadSurface() );
+    else if (surfaceType == SurfaceType::QUAD_SURFACE ) {
+        surfaces.push_back( new QuadSurface() );
     }
     else {
         throw std::runtime_error("Attempt to add non-existing surface type.");
     }
 }
 
-void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr)
+void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr)
 {
-    if ( surfaceType == ofxSurfaceType::TRIANGLE_SURFACE ) {
-        surfaces.push_back( new ofxTriangleSurface() );
+    if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) {
+        surfaces.push_back( new TriangleSurface() );
         surfaces.back()->setTexture(texturePtr);
     } 
-    else if (surfaceType == ofxSurfaceType::QUAD_SURFACE ) {
-        surfaces.push_back( new ofxQuadSurface() );
+    else if (surfaceType == SurfaceType::QUAD_SURFACE ) {
+        surfaces.push_back( new QuadSurface() );
         surfaces.back()->setTexture(texturePtr);
     }
     else {
@@ -45,9 +47,9 @@ void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr)
     }
 }
 
-void ofxSurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, vector<ofVec2f> texCoords)
+void SurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, vector<ofVec2f> texCoords)
 {
-    if ( surfaceType == ofxSurfaceType::TRIANGLE_SURFACE ) {
+    if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) {
         
         if ( vertices.size() < 3 ) {
             throw std::runtime_error("There must be 3 vertices for a triangle surface.");
@@ -55,7 +57,7 @@ void ofxSurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, ve
             throw std::runtime_error("There must be 3 texture coordinates for a triangle surface.");
         }
         
-        surfaces.push_back( new ofxTriangleSurface() );
+        surfaces.push_back( new TriangleSurface() );
         
         for ( int i=0; i<3; i++ ) {
             surfaces.back()->setVertex(i, vertices[i]);
@@ -63,14 +65,14 @@ void ofxSurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, ve
         }
         
     } 
-    else if (surfaceType == ofxSurfaceType::QUAD_SURFACE ) {
+    else if (surfaceType == SurfaceType::QUAD_SURFACE ) {
         if ( vertices.size() < 4 ) {
             throw std::runtime_error("There must be 4 vertices for a quad surface.");
         } else if (texCoords.size() < 4) {
             throw std::runtime_error("There must be 4 texture coordinates for a quad surface.");
         }
         
-        surfaces.push_back( new ofxQuadSurface() );
+        surfaces.push_back( new QuadSurface() );
         
         for ( int i=0; i<4; i++ ) {
             surfaces.back()->setVertex(i, vertices[i]);
@@ -83,9 +85,9 @@ void ofxSurfaceManager::addSurface(int surfaceType, vector<ofVec2f> vertices, ve
 
 }
 
-void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vector<ofVec2f> vertices, vector<ofVec2f> texCoords)
+void SurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vector<ofVec2f> vertices, vector<ofVec2f> texCoords)
 {
-    if ( surfaceType == ofxSurfaceType::TRIANGLE_SURFACE ) {
+    if ( surfaceType == SurfaceType::TRIANGLE_SURFACE ) {
         
         if ( vertices.size() < 3 ) {
             throw std::runtime_error("There must be 3 vertices for a triangle surface.");
@@ -93,7 +95,7 @@ void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vecto
             throw std::runtime_error("Thre must be 3 texture coordinates for a triangle surface.");
         }
         
-        surfaces.push_back( new ofxTriangleSurface() );
+        surfaces.push_back( new TriangleSurface() );
         surfaces.back()->setTexture(texturePtr);
         
         for ( int i=0; i<3; i++ ) {
@@ -102,14 +104,14 @@ void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vecto
         }
         
     } 
-    else if (surfaceType == ofxSurfaceType::QUAD_SURFACE ) {
+    else if (surfaceType == SurfaceType::QUAD_SURFACE ) {
         if ( vertices.size() < 4 ) {
             throw std::runtime_error("There must be 4 vertices for a quad surface.");
         } else if (texCoords.size() < 4) {
             throw std::runtime_error("Thre must be 4 texture coordinates for a quad surface.");
         }
         
-        surfaces.push_back( new ofxQuadSurface() );
+        surfaces.push_back( new QuadSurface() );
         surfaces.back()->setTexture(texturePtr);
         
         for ( int i=0; i<4; i++ ) {
@@ -122,7 +124,7 @@ void ofxSurfaceManager::addSurface(int surfaceType, ofTexture* texturePtr, vecto
     }
 }
 
-void ofxSurfaceManager::removeSelectedSurface()
+void SurfaceManager::removeSelectedSurface()
 {
     if ( selectedSurface == NULL ) return;
     
@@ -136,7 +138,7 @@ void ofxSurfaceManager::removeSelectedSurface()
     }
 }
 
-void ofxSurfaceManager::manageMemory()
+void SurfaceManager::manageMemory()
 {
     // check if each of the sources is assigned to a surface or not
     for ( int i=0; i<loadedImageSources.size(); i++ ) {
@@ -160,7 +162,7 @@ void ofxSurfaceManager::manageMemory()
     }
 }
 
-void ofxSurfaceManager::clear()
+void SurfaceManager::clear()
 {
     // delete all extra allocations from the heap
     while ( surfaces.size() ) {
@@ -178,7 +180,7 @@ void ofxSurfaceManager::clear()
     }
 }
 
-// String getTypeString(ofxSurfaceType e)
+// String getTypeString(SurfaceType e)
 // {
 //   switch e
 //   {
@@ -188,7 +190,7 @@ void ofxSurfaceManager::clear()
 //   }
 // }
 
-void ofxSurfaceManager::saveXmlSettings(string fileName)
+void SurfaceManager::saveXmlSettings(string fileName)
 {
     xmlSettings.clear();
     
@@ -199,7 +201,7 @@ void ofxSurfaceManager::saveXmlSettings(string fileName)
         
         xmlSettings.addTag("surface");
         xmlSettings.pushTag("surface", i);
-        ofxBaseSurface* surface = surfaces[i];
+        BaseSurface* surface = surfaces[i];
 
         xmlSettings.addTag("vertices");
         xmlSettings.pushTag("vertices");
@@ -241,8 +243,8 @@ void ofxSurfaceManager::saveXmlSettings(string fileName)
 
         // xmlSettings.addTag("type");
         // xmlSettings.pushTag("type");
-        // // surfaceType == ofxSurfaceType::TRIANGLE_SURFACE
-        // ofxSurfaceType surfaceType = &surface->getType();
+        // // surfaceType == SurfaceType::TRIANGLE_SURFACE
+        // SurfaceType surfaceType = &surface->getType();
         // xmlSettings.addValue("surface-type", surfaceType);
         // xmlSettings.popTag(); // type
 
@@ -253,7 +255,7 @@ void ofxSurfaceManager::saveXmlSettings(string fileName)
     xmlSettings.save(fileName);
 }
 
-void ofxSurfaceManager::loadXmlSettings(string fileName)
+void SurfaceManager::loadXmlSettings(string fileName)
 {
 
 
@@ -337,9 +339,9 @@ void ofxSurfaceManager::loadXmlSettings(string fileName)
             // now we have variables sourceName and sourceTexture
             // by checking those we can use one or another addSurface method
             if ( sourceName != "none" && sourceTexture != NULL ) {
-                addSurface(ofxSurfaceType::TRIANGLE_SURFACE, sourceTexture, vertices, texCoords);
+                addSurface(SurfaceType::TRIANGLE_SURFACE, sourceTexture, vertices, texCoords);
             } else {
-                addSurface(ofxSurfaceType::TRIANGLE_SURFACE, vertices, texCoords);
+                addSurface(SurfaceType::TRIANGLE_SURFACE, vertices, texCoords);
             }
         }
         // it's a quad ?
@@ -390,9 +392,9 @@ void ofxSurfaceManager::loadXmlSettings(string fileName)
             // now we have variables sourceName and sourceTexture
             // by checking those we can use one or another addSurface method
             if ( sourceName != "none" && sourceTexture != NULL ) {
-                addSurface(ofxSurfaceType::QUAD_SURFACE, sourceTexture, vertices, texCoords);
+                addSurface(SurfaceType::QUAD_SURFACE, sourceTexture, vertices, texCoords);
             } else {
-                addSurface(ofxSurfaceType::QUAD_SURFACE, vertices, texCoords);
+                addSurface(SurfaceType::QUAD_SURFACE, vertices, texCoords);
             }
             
             
@@ -404,7 +406,7 @@ void ofxSurfaceManager::loadXmlSettings(string fileName)
     xmlSettings.popTag(); // surfaces
 }
 
-ofxBaseSurface* ofxSurfaceManager::selectSurface(int index)
+BaseSurface* SurfaceManager::selectSurface(int index)
 {
     if ( index >= surfaces.size() ) {
         throw std::runtime_error("Surface index out of bounds.");
@@ -416,17 +418,17 @@ ofxBaseSurface* ofxSurfaceManager::selectSurface(int index)
     ofSendMessage("surfaceSelected");
 }
 
-ofxBaseSurface* ofxSurfaceManager::getSelectedSurface()
+BaseSurface* SurfaceManager::getSelectedSurface()
 {    
     return selectedSurface;
 }
 
-void ofxSurfaceManager::deselectSurface()
+void SurfaceManager::deselectSurface()
 {
     selectedSurface = NULL;
 }
 
-ofTexture* ofxSurfaceManager::loadImageSource(string name, string path)
+ofTexture* SurfaceManager::loadImageSource(string name, string path)
 {
     // check if it is loaded
     for ( int i=0; i<loadedImageSourceNames.size(); i++ ) {
@@ -446,7 +448,7 @@ ofTexture* ofxSurfaceManager::loadImageSource(string name, string path)
     return &image->getTextureReference();
 }
 
-string ofxSurfaceManager::getSelectedSurfaceSourceName()
+string SurfaceManager::getSelectedSurfaceSourceName()
 {
     if ( selectedSurface == NULL ) {
         return "none";
@@ -455,7 +457,7 @@ string ofxSurfaceManager::getSelectedSurfaceSourceName()
     return getSurfaceSourceName( selectedSurface );
 }
 
-string ofxSurfaceManager::getSurfaceSourceName(ofxBaseSurface *surface)
+string SurfaceManager::getSurfaceSourceName(BaseSurface *surface)
 {
     ofTexture* tex = surface->getTexture();
     for ( int i=0; i<loadedImageSources.size(); i++ ) {
@@ -467,7 +469,7 @@ string ofxSurfaceManager::getSurfaceSourceName(ofxBaseSurface *surface)
     return "none";
 }
 
-ofxBaseSurface* ofxSurfaceManager::getSurface(int index)
+BaseSurface* SurfaceManager::getSurface(int index)
 {
     if ( index >= surfaces.size() ) {
         throw std::runtime_error("Surface index out of bounds.");
@@ -477,10 +479,10 @@ ofxBaseSurface* ofxSurfaceManager::getSurface(int index)
     return surfaces[index];
 }
 
-int ofxSurfaceManager::size()
+int SurfaceManager::size()
 {
     return surfaces.size();
 }
 
-
+    }}
 
diff --git a/src/SurfaceManager.h b/src/SurfaceManager.h
index 90e8bb1..48df5c5 100755
--- a/src/SurfaceManager.h
+++ b/src/SurfaceManager.h
@@ -1,20 +1,23 @@
-#ifndef H_OFX_SURFACE_MANAGER
-#define H_OFX_SURFACE_MANAGER
+#pragma once
+
+#include "BaseSurface.h"
+#include "TriangleSurface.h"
+#include "QuadSurface.h"
+#include "SurfaceType.h"
 
-#include "ofxBaseSurface.h"
-#include "ofxTriangleSurface.h"
-#include "ofxQuadSurface.h"
-#include "ofxSurfaceType.h"
 #include "ofEvents.h"
 #include "ofxXmlSettings.h"
 
 using namespace std;
 
-class ofxSurfaceManager
+
+namespace ofx{
+    namespace piMapper{
+class SurfaceManager
 {
 public:
-    ofxSurfaceManager();
-    ~ofxSurfaceManager();
+    SurfaceManager();
+    ~SurfaceManager();
     
     void draw();
     void addSurface(int surfaceType);
@@ -27,22 +30,22 @@ public:
     void saveXmlSettings(string fileName);
     void loadXmlSettings(string fileName);
     
-    ofxBaseSurface* getSurface(int index);
+    BaseSurface* getSurface(int index);
     int size();
-    ofxBaseSurface* selectSurface(int index);
-    ofxBaseSurface* getSelectedSurface();
+    BaseSurface* selectSurface(int index);
+    BaseSurface* getSelectedSurface();
     void deselectSurface();
     ofTexture* loadImageSource(string name, string path);
     string getSelectedSurfaceSourceName();
-    string getSurfaceSourceName( ofxBaseSurface* surface );
+    string getSurfaceSourceName( BaseSurface* surface );
     
 private:
-    vector<ofxBaseSurface*> surfaces;
-    ofxBaseSurface* selectedSurface;
+    vector<BaseSurface*> surfaces;
+    BaseSurface* selectedSurface;
     vector<string> loadedImageSourceNames;
     vector<ofImage*> loadedImageSources;
     ofxXmlSettings xmlSettings;
     
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/SurfaceManagerGui.cpp b/src/SurfaceManagerGui.cpp
index 49d5a1e..e932810 100644
--- a/src/SurfaceManagerGui.cpp
+++ b/src/SurfaceManagerGui.cpp
@@ -1,41 +1,43 @@
-#include "ofxSurfaceManagerGui.h"
+#include "SurfaceManagerGui.h"
 
-ofxSurfaceManagerGui::ofxSurfaceManagerGui()
+namespace ofx{
+    namespace piMapper{
+SurfaceManagerGui::SurfaceManagerGui()
 {
     surfaceManager = NULL;
-    guiMode = ofxGuiMode::NONE;
+    guiMode = GuiMode::NONE;
     bDrag = false;
     registerMouseEvents();
     ofHideCursor();
 }
 
-ofxSurfaceManagerGui::~ofxSurfaceManagerGui()
+SurfaceManagerGui::~SurfaceManagerGui()
 {
     unregisterMouseEvents();
     surfaceManager = NULL;
 }
 
-void ofxSurfaceManagerGui::registerMouseEvents()
+void SurfaceManagerGui::registerMouseEvents()
 {
-    ofAddListener(ofEvents().mousePressed, this, &ofxSurfaceManagerGui::mousePressed);
-    ofAddListener(ofEvents().mouseReleased, this, &ofxSurfaceManagerGui::mouseReleased);
-    ofAddListener(ofEvents().mouseDragged, this, &ofxSurfaceManagerGui::mouseDragged);
+    ofAddListener(ofEvents().mousePressed, this, &SurfaceManagerGui::mousePressed);
+    ofAddListener(ofEvents().mouseReleased, this, &SurfaceManagerGui::mouseReleased);
+    ofAddListener(ofEvents().mouseDragged, this, &SurfaceManagerGui::mouseDragged);
 }
 
-void ofxSurfaceManagerGui::unregisterMouseEvents()
+void SurfaceManagerGui::unregisterMouseEvents()
 {
-    ofRemoveListener(ofEvents().mousePressed, this, &ofxSurfaceManagerGui::mousePressed);
-    ofRemoveListener(ofEvents().mouseReleased, this, &ofxSurfaceManagerGui::mouseReleased);
-    ofRemoveListener(ofEvents().mouseDragged, this, &ofxSurfaceManagerGui::mouseDragged);
+    ofRemoveListener(ofEvents().mousePressed, this, &SurfaceManagerGui::mousePressed);
+    ofRemoveListener(ofEvents().mouseReleased, this, &SurfaceManagerGui::mouseReleased);
+    ofRemoveListener(ofEvents().mouseDragged, this, &SurfaceManagerGui::mouseDragged);
 }
 
-void ofxSurfaceManagerGui::draw()
+void SurfaceManagerGui::draw()
 {
     if ( surfaceManager == NULL ) return;
     
-    if ( guiMode == ofxGuiMode::NONE ) {
+    if ( guiMode == GuiMode::NONE ) {
         surfaceManager->draw();
-    } else if ( guiMode == ofxGuiMode::TEXTURE_MAPPING ) {
+    } else if ( guiMode == GuiMode::TEXTURE_MAPPING ) {
         
         // draw the texture of the selected surface
         if ( surfaceManager->getSelectedSurface() != NULL ) {
@@ -57,7 +59,7 @@ void ofxSurfaceManagerGui::draw()
         // draw texture editing GUI on top
         textureEditor.draw();
         
-    } else if ( guiMode == ofxGuiMode::PROJECTION_MAPPING ) {
+    } else if ( guiMode == GuiMode::PROJECTION_MAPPING ) {
         
         // draw projection surfaces first
         surfaceManager->draw();
@@ -68,7 +70,7 @@ void ofxSurfaceManagerGui::draw()
         // draw projection mapping editing gui
         projectionEditor.draw();
         
-    } else if ( guiMode == ofxGuiMode::SOURCE_SELECTION ) {
+    } else if ( guiMode == GuiMode::SOURCE_SELECTION ) {
         // draw projection surfaces first
         surfaceManager->draw();
         
@@ -79,15 +81,15 @@ void ofxSurfaceManagerGui::draw()
     }
 }
 
-void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
+void SurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
 {
-    if ( guiMode == ofxGuiMode::NONE ) {
+    if ( guiMode == GuiMode::NONE ) {
         return;
-    } else if ( guiMode == ofxGuiMode::TEXTURE_MAPPING ) {
+    } else if ( guiMode == GuiMode::TEXTURE_MAPPING ) {
         
         bool bSurfaceSelected = false;
         
-        ofxCircleJoint* hitJoint = textureEditor.hitTestJoints(ofVec2f(args.x, args.y));
+        CircleJoint* hitJoint = textureEditor.hitTestJoints(ofVec2f(args.x, args.y));
         if ( hitJoint != NULL ) {
             textureEditor.unselectAllJoints();
             hitJoint->select();
@@ -105,11 +107,11 @@ void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
             }
         }
         
-    } else if ( guiMode == ofxGuiMode::PROJECTION_MAPPING ) {
+    } else if ( guiMode == GuiMode::PROJECTION_MAPPING ) {
         
         bool bSurfaceSelected = false;
         
-        ofxCircleJoint* hitJoint = projectionEditor.hitTestJoints(ofVec2f(args.x, args.y));
+        CircleJoint* hitJoint = projectionEditor.hitTestJoints(ofVec2f(args.x, args.y));
         if ( hitJoint != NULL ) {
             projectionEditor.unselectAllJoints();
             hitJoint->select();
@@ -141,51 +143,51 @@ void ofxSurfaceManagerGui::mousePressed(ofMouseEventArgs &args)
             projectionEditor.clearJoints();
             surfaceManager->deselectSurface();
         }
-    } else if ( guiMode == ofxGuiMode::SOURCE_SELECTION ) {
+    } else if ( guiMode == GuiMode::SOURCE_SELECTION ) {
         
     }
 }
 
-void ofxSurfaceManagerGui::mouseReleased(ofMouseEventArgs &args)
+void SurfaceManagerGui::mouseReleased(ofMouseEventArgs &args)
 {
     stopDrag();
     projectionEditor.stopDragJoints();
     textureEditor.stopDragJoints();
 }
 
-void ofxSurfaceManagerGui::mouseDragged(ofMouseEventArgs &args)
+void SurfaceManagerGui::mouseDragged(ofMouseEventArgs &args)
 {
     if (bDrag) {
         ofVec2f mousePosition = ofVec2f(args.x, args.y);
         ofVec2f distance = mousePosition - clickPosition;
         
-        if ( guiMode == ofxGuiMode::PROJECTION_MAPPING ) {
+        if ( guiMode == GuiMode::PROJECTION_MAPPING ) {
             // add this distance to all vertices in surface
             projectionEditor.moveSelectedSurface(distance);
-        } else if ( guiMode == ofxGuiMode::TEXTURE_MAPPING ) {
+        } else if ( guiMode == GuiMode::TEXTURE_MAPPING ) {
             textureEditor.moveTexCoords(distance);
         }
         clickPosition = mousePosition;
     }
 }
 
-void ofxSurfaceManagerGui::setSurfaceManager(ofxSurfaceManager* newSurfaceManager)
+void SurfaceManagerGui::setSurfaceManager(SurfaceManager* newSurfaceManager)
 {
     surfaceManager = newSurfaceManager;
     projectionEditor.setSurfaceManager( surfaceManager );
     sourcesEditor.setSurfaceManager( surfaceManager );
 }
 
-void ofxSurfaceManagerGui::setMode(int newGuiMode)
+void SurfaceManagerGui::setMode(int newGuiMode)
 {
-    if (newGuiMode != ofxGuiMode::NONE &&
-        newGuiMode != ofxGuiMode::TEXTURE_MAPPING &&
-        newGuiMode != ofxGuiMode::PROJECTION_MAPPING &&
-        newGuiMode != ofxGuiMode::SOURCE_SELECTION) {
+    if (newGuiMode != GuiMode::NONE &&
+        newGuiMode != GuiMode::TEXTURE_MAPPING &&
+        newGuiMode != GuiMode::PROJECTION_MAPPING &&
+        newGuiMode != GuiMode::SOURCE_SELECTION) {
         throw std::runtime_error("Trying to set invalid mode.");
     }
     
-    if ( newGuiMode == ofxGuiMode::NONE ) {
+    if ( newGuiMode == GuiMode::NONE ) {
         ofHideCursor();
     } else {
         ofShowCursor();
@@ -193,7 +195,7 @@ void ofxSurfaceManagerGui::setMode(int newGuiMode)
     
     guiMode = newGuiMode;
     
-    if ( guiMode == ofxGuiMode::SOURCE_SELECTION ) {
+    if ( guiMode == GuiMode::SOURCE_SELECTION ) {
         sourcesEditor.enable();
         string sourceName = surfaceManager->getSelectedSurfaceSourceName();
         sourcesEditor.selectImageSourceRadioButton(sourceName);
@@ -201,7 +203,7 @@ void ofxSurfaceManagerGui::setMode(int newGuiMode)
         sourcesEditor.disable();
     }
     
-    if ( guiMode == ofxGuiMode::TEXTURE_MAPPING ) {
+    if ( guiMode == GuiMode::TEXTURE_MAPPING ) {
         textureEditor.enable();
         // refresh texture editor surface reference
         textureEditor.setSurface(surfaceManager->getSelectedSurface());
@@ -209,14 +211,14 @@ void ofxSurfaceManagerGui::setMode(int newGuiMode)
         textureEditor.disable();
     }
     
-    if (guiMode == ofxGuiMode::PROJECTION_MAPPING) {
+    if (guiMode == GuiMode::PROJECTION_MAPPING) {
         projectionEditor.enable();
     } else {
         projectionEditor.disable();
     }
 }
 
-void ofxSurfaceManagerGui::drawSelectedSurfaceHighlight()
+void SurfaceManagerGui::drawSelectedSurfaceHighlight()
 {
     if ( surfaceManager->getSelectedSurface() == NULL ) return;
     
@@ -229,7 +231,7 @@ void ofxSurfaceManagerGui::drawSelectedSurfaceHighlight()
     ofPopStyle();
 }
 
-void ofxSurfaceManagerGui::drawSelectedSurfaceTextureHighlight()
+void SurfaceManagerGui::drawSelectedSurfaceTextureHighlight()
 {
     if ( surfaceManager->getSelectedSurface() == NULL ) return;
     
@@ -243,12 +245,14 @@ void ofxSurfaceManagerGui::drawSelectedSurfaceTextureHighlight()
 
 }
 
-void ofxSurfaceManagerGui::startDrag()
+void SurfaceManagerGui::startDrag()
 {
     bDrag = true;
 }
 
-void ofxSurfaceManagerGui::stopDrag()
+void SurfaceManagerGui::stopDrag()
 {
     bDrag = false;
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/SurfaceManagerGui.h b/src/SurfaceManagerGui.h
index 605d8a1..0dc8743 100644
--- a/src/SurfaceManagerGui.h
+++ b/src/SurfaceManagerGui.h
@@ -1,22 +1,24 @@
-#ifndef H_OFX_SURFACE_MANAGER_GUI
-#define H_OFX_SURFACE_MANAGER_GUI
+#pragma once
 
 // I'm starting to think, maybe we should use ofxStateMachine here.
 // Would make sense. TODO later.
 
 #include "ofEvents.h"
-#include "ofxSurfaceManager.h"
-#include "ofxTextureEditor.h"
-#include "ofxProjectionEditor.h"
-#include "ofxSourcesEditor.h"
-#include "ofxGuiMode.h"
 #include "ofGraphics.h"
 
-class ofxSurfaceManagerGui
+#include "SurfaceManager.h"
+#include "TextureEditor.h"
+#include "ProjectionEditor.h"
+#include "SourcesEditor.h"
+#include "GuiMode.h"
+
+namespace ofx{
+    namespace piMapper{
+class SurfaceManagerGui
 {
 public:
-    ofxSurfaceManagerGui();
-    ~ofxSurfaceManagerGui();
+    SurfaceManagerGui();
+    ~SurfaceManagerGui();
     
     void registerMouseEvents();
     void unregisterMouseEvents();
@@ -25,7 +27,7 @@ public:
     void mousePressed(ofMouseEventArgs& args);
     void mouseReleased(ofMouseEventArgs& args);
     void mouseDragged(ofMouseEventArgs& args);
-    void setSurfaceManager(ofxSurfaceManager* newSurfaceManager);
+    void setSurfaceManager(SurfaceManager* newSurfaceManager);
     void setMode(int newGuiMode);
     void drawSelectedSurfaceHighlight();
     void drawSelectedSurfaceTextureHighlight();
@@ -33,14 +35,14 @@ public:
     void stopDrag();
     
 private:
-    ofxSurfaceManager* surfaceManager;
-    ofxTextureEditor textureEditor;
-    ofxProjectionEditor projectionEditor;
-    ofxSourcesEditor sourcesEditor;
+    SurfaceManager* surfaceManager;
+    TextureEditor textureEditor;
+    ProjectionEditor projectionEditor;
+    SourcesEditor sourcesEditor;
     int guiMode;
     bool bDrag;
     ofVec2f clickPosition;
     
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/SurfaceType.h b/src/SurfaceType.h
index cbda131..21deb9b 100755
--- a/src/SurfaceType.h
+++ b/src/SurfaceType.h
@@ -1,7 +1,8 @@
-#ifndef H_OFX_SURFACE_TYPE
-#define H_OFX_SURFACE_TYPE
+#pragma once
 
-struct ofxSurfaceType
+namespace ofx{
+    namespace piMapper{
+struct SurfaceType
 {
     enum {
         TRIANGLE_SURFACE,
@@ -9,4 +10,4 @@ struct ofxSurfaceType
     };
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/TextureEditor.cpp b/src/TextureEditor.cpp
index 0a1aa41..a0a9eba 100755
--- a/src/TextureEditor.cpp
+++ b/src/TextureEditor.cpp
@@ -1,53 +1,55 @@
-#include "ofxTextureEditor.h"
+#include "TextureEditor.h"
 
-ofxTextureEditor::ofxTextureEditor()
+namespace ofx{
+    namespace piMapper{
+TextureEditor::TextureEditor()
 {
     clear();
     enable();
 }
 
-ofxTextureEditor::~ofxTextureEditor()
+TextureEditor::~TextureEditor()
 {
     clear();
     disable();
 }
 
-void ofxTextureEditor::registerAppEvents()
+void TextureEditor::registerAppEvents()
 {
-    ofAddListener(ofEvents().update, this, &ofxTextureEditor::update);
+    ofAddListener(ofEvents().update, this, &TextureEditor::update);
 }
 
-void ofxTextureEditor::unregisterAppEvents()
+void TextureEditor::unregisterAppEvents()
 {
-    ofRemoveListener(ofEvents().update, this, &ofxTextureEditor::update);
+    ofRemoveListener(ofEvents().update, this, &TextureEditor::update);
 }
 
-void ofxTextureEditor::registerKeyEvents()
+void TextureEditor::registerKeyEvents()
 {
-    ofAddListener(ofEvents().keyPressed, this, &ofxTextureEditor::keyPressed);
-    ofAddListener(ofEvents().keyReleased, this, &ofxTextureEditor::keyReleased);
+    ofAddListener(ofEvents().keyPressed, this, &TextureEditor::keyPressed);
+    ofAddListener(ofEvents().keyReleased, this, &TextureEditor::keyReleased);
 }
 
-void ofxTextureEditor::unregisterKeyEvents()
+void TextureEditor::unregisterKeyEvents()
 {
-    ofRemoveListener(ofEvents().keyPressed, this, &ofxTextureEditor::keyPressed);
-    ofRemoveListener(ofEvents().keyReleased, this, &ofxTextureEditor::keyReleased);
+    ofRemoveListener(ofEvents().keyPressed, this, &TextureEditor::keyPressed);
+    ofRemoveListener(ofEvents().keyReleased, this, &TextureEditor::keyReleased);
 }
 
-void ofxTextureEditor::enable()
+void TextureEditor::enable()
 {
     registerAppEvents();
     registerKeyEvents();
     bShiftKeyDown = false;
 }
 
-void ofxTextureEditor::disable()
+void TextureEditor::disable()
 {
     unregisterAppEvents();
     unregisterKeyEvents();
 }
 
-void ofxTextureEditor::update(ofEventArgs &args)
+void TextureEditor::update(ofEventArgs &args)
 {
     if ( surface == NULL ) return;
     
@@ -62,7 +64,7 @@ void ofxTextureEditor::update(ofEventArgs &args)
     }
 }
 
-void ofxTextureEditor::keyPressed(ofKeyEventArgs &args)
+void TextureEditor::keyPressed(ofKeyEventArgs &args)
 {
     int key = args.key;
     float moveStep;
@@ -79,7 +81,7 @@ void ofxTextureEditor::keyPressed(ofKeyEventArgs &args)
     }
 }
 
-void ofxTextureEditor::keyReleased(ofKeyEventArgs &args)
+void TextureEditor::keyReleased(ofKeyEventArgs &args)
 {
     int key = args.key;
     switch (key) {
@@ -88,33 +90,33 @@ void ofxTextureEditor::keyReleased(ofKeyEventArgs &args)
 }
 
 
-void ofxTextureEditor::draw()
+void TextureEditor::draw()
 {
     if (surface == NULL) return;
     
     drawJoints();
 }
 
-void ofxTextureEditor::drawJoints()
+void TextureEditor::drawJoints()
 {
     for ( int i=0; i<joints.size(); i++ ) {
         joints[i]->draw();
     }
 }
 
-void ofxTextureEditor::setSurface(ofxBaseSurface* newSurface)
+void TextureEditor::setSurface(BaseSurface* newSurface)
 {
     surface = newSurface;
     createJoints();
 }
 
-void ofxTextureEditor::clear()
+void TextureEditor::clear()
 {
     surface = NULL;
     clearJoints();
 }
 
-void ofxTextureEditor::createJoints()
+void TextureEditor::createJoints()
 {
     if ( surface == NULL ) return;
     clearJoints();
@@ -122,12 +124,12 @@ void ofxTextureEditor::createJoints()
     ofVec2f textureSize = ofVec2f(surface->getTexture()->getWidth(), surface->getTexture()->getHeight());
     
     for ( int i=0; i<texCoords.size(); i++ ) {
-        joints.push_back(new ofxCircleJoint());
+        joints.push_back(new CircleJoint());
         joints.back()->position = texCoords[i] * textureSize;
     }
 }
 
-void ofxTextureEditor::clearJoints()
+void TextureEditor::clearJoints()
 {
     while ( joints.size() ) {
         delete joints.back();
@@ -135,14 +137,14 @@ void ofxTextureEditor::clearJoints()
     }
 }
 
-void ofxTextureEditor::unselectAllJoints()
+void TextureEditor::unselectAllJoints()
 {
     for ( int i=0; i<joints.size(); i++ ) {
         joints[i]->unselect();
     }
 }
 
-void ofxTextureEditor::moveTexCoords(ofVec2f by)
+void TextureEditor::moveTexCoords(ofVec2f by)
 {
     if ( surface == NULL ) return;
     vector<ofVec2f>& texCoords = surface->getTexCoords();
@@ -153,18 +155,18 @@ void ofxTextureEditor::moveTexCoords(ofVec2f by)
     }
 }
 
-void ofxTextureEditor::stopDragJoints()
+void TextureEditor::stopDragJoints()
 {
     for (int i=0; i<joints.size(); i++){
         joints[i]->stopDrag();
     }
 }
 
-void ofxTextureEditor::moveSelection(ofVec2f by)
+void TextureEditor::moveSelection(ofVec2f by)
 {
     // check if joints selected
     bool bJointSelected = false;
-    ofxBaseJoint* selectedJoint;
+    BaseJoint* selectedJoint;
     for ( int i=0; i<joints.size(); i++ ) {
         if (joints[i]->isSelected()) {
             bJointSelected = true;
@@ -180,7 +182,7 @@ void ofxTextureEditor::moveSelection(ofVec2f by)
     }
 }
 
-ofxCircleJoint* ofxTextureEditor::hitTestJoints(ofVec2f pos)
+CircleJoint* TextureEditor::hitTestJoints(ofVec2f pos)
 {
     for ( int i=0; i<joints.size(); i++ ) {
         if ( joints[i]->hitTest(pos) ){
@@ -188,4 +190,6 @@ ofxCircleJoint* ofxTextureEditor::hitTestJoints(ofVec2f pos)
         }
     }
     return NULL;
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/TextureEditor.h b/src/TextureEditor.h
index 18f30ef..1387984 100644
--- a/src/TextureEditor.h
+++ b/src/TextureEditor.h
@@ -1,15 +1,18 @@
-#ifndef H_OFX_TEXTURE_EDITOR
-#define H_OFX_TEXTURE_EDITOR
+#pragma once
 
 #include "ofEvents.h"
-#include "ofxBaseSurface.h"
-#include "ofxCircleJoint.h"
 
-class ofxTextureEditor
+#include "BaseSurface.h"
+#include "CircleJoint.h"
+
+
+namespace ofx{
+    namespace piMapper{
+class TextureEditor
 {
 public:
-    ofxTextureEditor();
-    ~ofxTextureEditor();
+    TextureEditor();
+    ~TextureEditor();
     
     void registerAppEvents();
     void unregisterAppEvents();
@@ -23,7 +26,7 @@ public:
     void keyReleased(ofKeyEventArgs& args);
     void draw();
     void drawJoints();
-    void setSurface(ofxBaseSurface* newSurface);
+    void setSurface(BaseSurface* newSurface);
     void clear();
     void createJoints();
     void clearJoints();
@@ -31,12 +34,12 @@ public:
     void moveTexCoords(ofVec2f by);
     void stopDragJoints();
     void moveSelection(ofVec2f by);
-    ofxCircleJoint* hitTestJoints(ofVec2f pos);
+    CircleJoint* hitTestJoints(ofVec2f pos);
     
 private:
-    ofxBaseSurface* surface;
-    vector<ofxCircleJoint*> joints;
+    BaseSurface* surface;
+    vector<CircleJoint*> joints;
     bool bShiftKeyDown;
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/TriangleSurface.cpp b/src/TriangleSurface.cpp
index 56d0a44..950e360 100644
--- a/src/TriangleSurface.cpp
+++ b/src/TriangleSurface.cpp
@@ -1,17 +1,19 @@
-#include "ofxTriangleSurface.h"
+#include "TriangleSurface.h"
 
-ofxTriangleSurface::ofxTriangleSurface()
+namespace ofx{
+    namespace piMapper{
+TriangleSurface::TriangleSurface()
 {
-	cout << "ofxTriangleSurface constructor." << endl;
+	cout << "TriangleSurface constructor." << endl;
     setup();
 }
 
-ofxTriangleSurface::~ofxTriangleSurface()
+TriangleSurface::~TriangleSurface()
 {
-	cout << "ofxTriangleSurface destructor." << endl;
+	cout << "TriangleSurface destructor." << endl;
 }
 
-void ofxTriangleSurface::setup()
+void TriangleSurface::setup()
 {
     // Create 3 points for the triangle
     ofVec2f p1 = ofVec2f(ofGetWidth()/2.0f, 0);
@@ -26,7 +28,7 @@ void ofxTriangleSurface::setup()
     setup( p1, p2, p3, t1, t2, t3, texture );
 }
 
-void ofxTriangleSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f t1, ofVec2f t2, ofVec2f t3, ofTexture* texturePtr )
+void TriangleSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f t1, ofVec2f t2, ofVec2f t3, ofTexture* texturePtr )
 {
     // Assign texture
     texture = texturePtr;
@@ -45,14 +47,14 @@ void ofxTriangleSurface::setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f t1,
     mesh.addTexCoord(t3);
 }
 
-void ofxTriangleSurface::draw()
+void TriangleSurface::draw()
 {
     texture->bind();
     mesh.draw();
     texture->unbind();
 }
 
-void ofxTriangleSurface::setVertex(int index, ofVec2f p)
+void TriangleSurface::setVertex(int index, ofVec2f p)
 {
     if ( index > 2 ) {
         ofLog() << "Vertex with this index does not exist: " << index << endl;
@@ -62,7 +64,7 @@ void ofxTriangleSurface::setVertex(int index, ofVec2f p)
     mesh.setVertex(index, p);
 }
 
-void ofxTriangleSurface::setTexCoord(int index, ofVec2f t)
+void TriangleSurface::setTexCoord(int index, ofVec2f t)
 {
     if ( index > 2 ) {
         ofLog() << "Texture coordinate with this index does not exist: " << index << endl;
@@ -72,7 +74,7 @@ void ofxTriangleSurface::setTexCoord(int index, ofVec2f t)
     mesh.setTexCoord(index, t);
 }
 
-void ofxTriangleSurface::moveBy(ofVec2f v)
+void TriangleSurface::moveBy(ofVec2f v)
 {
     vector<ofVec3f>& vertices = getVertices();
     for (int i=0; i<vertices.size(); i++) {
@@ -80,12 +82,12 @@ void ofxTriangleSurface::moveBy(ofVec2f v)
     }
 }
 
-int ofxTriangleSurface::getType()
+int TriangleSurface::getType()
 {
-    return ofxSurfaceType::TRIANGLE_SURFACE;
+    return SurfaceType::TRIANGLE_SURFACE;
 }
 
-bool ofxTriangleSurface::hitTest(ofVec2f p)
+bool TriangleSurface::hitTest(ofVec2f p)
 {
     // Construct ofPolyline from vertices
     ofPolyline line = getHitArea();
@@ -97,7 +99,7 @@ bool ofxTriangleSurface::hitTest(ofVec2f p)
     }
 }
 
-ofVec2f ofxTriangleSurface::getVertex(int index)
+ofVec2f TriangleSurface::getVertex(int index)
 {
     if ( index > 2 ) {
         ofLog() << "Vertex with this index does not exist: " << index << endl;
@@ -108,7 +110,7 @@ ofVec2f ofxTriangleSurface::getVertex(int index)
     return ofVec2f(vert.x, vert.y);
 }
 
-ofVec2f ofxTriangleSurface::getTexCoord(int index)
+ofVec2f TriangleSurface::getTexCoord(int index)
 {
     if (index > 2) {
         throw std::runtime_error("Texture coordinate index out of bounds.");
@@ -117,7 +119,7 @@ ofVec2f ofxTriangleSurface::getTexCoord(int index)
     return mesh.getTexCoord(index);
 }
 
-ofPolyline ofxTriangleSurface::getHitArea()
+ofPolyline TriangleSurface::getHitArea()
 {
     ofPolyline line;
     line.addVertex( ofPoint( mesh.getVertex(0).x, mesh.getVertex(0).y ) );
@@ -128,7 +130,7 @@ ofPolyline ofxTriangleSurface::getHitArea()
     return line;
 }
 
-ofPolyline ofxTriangleSurface::getTextureHitArea()
+ofPolyline TriangleSurface::getTextureHitArea()
 {
     ofPolyline line;
     vector<ofVec2f>& texCoords = mesh.getTexCoords();
@@ -141,14 +143,16 @@ ofPolyline ofxTriangleSurface::getTextureHitArea()
     return line;
 }
 
-vector<ofVec3f>& ofxTriangleSurface::getVertices()
+vector<ofVec3f>& TriangleSurface::getVertices()
 {
     // return only joint vertices
     return mesh.getVertices();
 }
 
-vector<ofVec2f>& ofxTriangleSurface::getTexCoords()
+vector<ofVec2f>& TriangleSurface::getTexCoords()
 {
     
     return mesh.getTexCoords();
-}
\ No newline at end of file
+}
+
+    }}
\ No newline at end of file
diff --git a/src/TriangleSurface.h b/src/TriangleSurface.h
index 27d3865..f1b2e74 100644
--- a/src/TriangleSurface.h
+++ b/src/TriangleSurface.h
@@ -1,15 +1,17 @@
-#ifndef H_OFX_TRIANGLE_SURFACE
-#define H_OFX_TRIANGLE_SURFACE
+#pragma once
 
 #include "ofMain.h"
-#include "ofxBaseSurface.h"
-#include "ofxSurfaceType.h"
+#include "BaseSurface.h"
+#include "SurfaceType.h"
 
-class ofxTriangleSurface : public ofxBaseSurface
+
+namespace ofx{
+    namespace piMapper{
+class TriangleSurface : public BaseSurface
 {
 public:
-	ofxTriangleSurface();
-	~ofxTriangleSurface();
+	TriangleSurface();
+	~TriangleSurface();
     
     void setup();
     void setup( ofVec2f p1, ofVec2f p2, ofVec2f p3, ofVec2f t1, ofVec2f t2, ofVec2f t3, ofTexture* texturePtr );
@@ -28,4 +30,4 @@ public:
     vector<ofVec2f>& getTexCoords();
 };
 
-#endif
\ No newline at end of file
+    }}
\ No newline at end of file
diff --git a/src/ofxPiMapper.h b/src/ofxPiMapper.h
index 4f65bd2..b0b5fea 100644
--- a/src/ofxPiMapper.h
+++ b/src/ofxPiMapper.h
@@ -1,7 +1,4 @@
-#ifndef H_OFX_PI_MAPPER
-#define H_OFX_PI_MAPPER
+#pragma once
 
-#include "ofxSurfaceManager.h"
-#include "ofxSurfaceManagerGui.h"
-
-#endif
\ No newline at end of file
+#include "SurfaceManager.h"
+#include "SurfaceManagerGui.h"
\ No newline at end of file
diff --git a/src/ui/RadioList.cpp b/src/ui/RadioList.cpp
index e974284..a1d5cf5 100644
--- a/src/ui/RadioList.cpp
+++ b/src/ui/RadioList.cpp
@@ -1,29 +1,31 @@
-#include "ofxRadioList.h"
+#include "RadioList.h"
 
-ofxRadioList::ofxRadioList()
+namespace ofx{
+    namespace piMapper{
+RadioList::RadioList()
 {
     storedTitle = "";
     storedSelectedItem = 0;
 }
 
-ofxRadioList::ofxRadioList(vector<string> &labels)
+RadioList::RadioList(vector<string> &labels)
 {
-    ofxRadioList();
+    RadioList();
     setup(labels);
 }
 
-ofxRadioList::ofxRadioList(string title, vector<string> &labels)
+RadioList::RadioList(string title, vector<string> &labels)
 {
-    ofxRadioList();
+    RadioList();
     setup(title, labels);
 }
 
-ofxRadioList::~ofxRadioList()
+RadioList::~RadioList()
 {
     clear();
 }
 
-void ofxRadioList::setup(vector<string> &labels)
+void RadioList::setup(vector<string> &labels)
 {
     // Copy incomming labels for later use
     storedLabels = labels;
@@ -34,14 +36,14 @@ void ofxRadioList::setup(vector<string> &labels)
         ofxToggle* toggle = new ofxToggle();
         toggle->setup(false);
         toggle->setName(labels[i]);
-        toggle->addListener(this, &ofxRadioList::onToggleClicked);
+        toggle->addListener(this, &RadioList::onToggleClicked);
         guiGroup.add(toggle);
     }
     
     cout << "num items: " << guiGroup.getNumControls() << endl;
 }
 
-void ofxRadioList::setup(string title, vector<string> &labels)
+void RadioList::setup(string title, vector<string> &labels)
 {
     // Store title for later use
     storedTitle = title;
@@ -49,28 +51,28 @@ void ofxRadioList::setup(string title, vector<string> &labels)
     setup(labels);
 }
 
-void ofxRadioList::draw()
+void RadioList::draw()
 {
     guiGroup.draw();
 }
 
-void ofxRadioList::setTitle(string title)
+void RadioList::setTitle(string title)
 {
     storedTitle = title;
     guiGroup.setName(title);
 }
 
-void ofxRadioList::setPosition(ofPoint p)
+void RadioList::setPosition(ofPoint p)
 {
     guiGroup.setPosition(p);
 }
 
-void ofxRadioList::setPosition(float x, float y)
+void RadioList::setPosition(float x, float y)
 {
     guiGroup.setPosition(x, y);
 }
 
-void ofxRadioList::selectItem(int index)
+void RadioList::selectItem(int index)
 {
     if (index >= guiGroup.getNumControls()) {
         return;
@@ -79,16 +81,16 @@ void ofxRadioList::selectItem(int index)
     unselectAll();
     
     ofxToggle* toggle = static_cast<ofxToggle*>(guiGroup.getControl(index));
-    toggle->removeListener(this, &ofxRadioList::onToggleClicked);
+    toggle->removeListener(this, &RadioList::onToggleClicked);
     *toggle = true; // Select the specific radio button
-    toggle->addListener(this, &ofxRadioList::onToggleClicked);
+    toggle->addListener(this, &RadioList::onToggleClicked);
     string name = toggle->getName();
     ofNotifyEvent(radioSelectedEvent, name, this);
     
     storedSelectedItem = index;
 }
 
-void ofxRadioList::enable()
+void RadioList::enable()
 {
     if (guiGroup.getNumControls() >= 0) {
         clear();
@@ -99,63 +101,63 @@ void ofxRadioList::enable()
     
     // Select the stored selected item without throwing an event
     ofxToggle* toggle = static_cast<ofxToggle*>(guiGroup.getControl(storedSelectedItem));
-    toggle->removeListener(this, &ofxRadioList::onToggleClicked);
+    toggle->removeListener(this, &RadioList::onToggleClicked);
     *toggle = true;
-    toggle->addListener(this, &ofxRadioList::onToggleClicked);
+    toggle->addListener(this, &RadioList::onToggleClicked);
     
     cout << "num items after enable: " << guiGroup.getNumControls() << endl;
 }
 
-void ofxRadioList::disable()
+void RadioList::disable()
 {
     // Just remove everything
     clear();
 }
 
-void ofxRadioList::clear()
+void RadioList::clear()
 {
     int i;
     for (i = 0; i < guiGroup.getNumControls(); i++) {
         ofxToggle* toggle = static_cast<ofxToggle*>(guiGroup.getControl(i));
-        toggle->removeListener(this, &ofxRadioList::onToggleClicked);
+        toggle->removeListener(this, &RadioList::onToggleClicked);
         delete toggle;
     }
     guiGroup.clear();
 }
 
-void ofxRadioList::unselectAll()
+void RadioList::unselectAll()
 {
     int i;
     for (i = 0; i < guiGroup.getNumControls(); i++) {
         ofxToggle* toggle = static_cast<ofxToggle*>(guiGroup.getControl(i));
         ofParameter<bool>* paramPtr = static_cast<ofParameter<bool>*>(&toggle->getParameter());
-        toggle->removeListener(this, &ofxRadioList::onToggleClicked);
+        toggle->removeListener(this, &RadioList::onToggleClicked);
         *toggle = false;
-        toggle->addListener(this, &ofxRadioList::onToggleClicked);
+        toggle->addListener(this, &RadioList::onToggleClicked);
     }
 }
 
-ofPoint ofxRadioList::getPosition()
+ofPoint RadioList::getPosition()
 {
     return guiGroup.getPosition();
 }
 
-float ofxRadioList::getWidth()
+float RadioList::getWidth()
 {
     return guiGroup.getWidth();
 }
 
-float ofxRadioList::getHeight()
+float RadioList::getHeight()
 {
     return guiGroup.getHeight();
 }
 
-string ofxRadioList::getTitle()
+string RadioList::getTitle()
 {
     return guiGroup.getName();
 }
 
-string ofxRadioList::getItemName(int index)
+string RadioList::getItemName(int index)
 {
     if (index >= guiGroup.getNumControls()) {
         return "";
@@ -165,12 +167,12 @@ string ofxRadioList::getItemName(int index)
     return toggle->getName();
 }
 
-int ofxRadioList::size()
+int RadioList::size()
 {
     return guiGroup.getNumControls();
 }
 
-void ofxRadioList::onToggleClicked(bool &toggleValue)
+void RadioList::onToggleClicked(bool &toggleValue)
 {
     unselectAll();
     
@@ -186,3 +188,5 @@ void ofxRadioList::onToggleClicked(bool &toggleValue)
         }
     }
 }
+        
+    }}
diff --git a/src/ui/RadioList.h b/src/ui/RadioList.h
index 2736352..0d1daea 100644
--- a/src/ui/RadioList.h
+++ b/src/ui/RadioList.h
@@ -5,13 +5,15 @@
 #include "ofxToggle.h"
 #include "ofxLabel.h"
 
-class ofxRadioList
+namespace ofx{
+    namespace piMapper{
+class RadioList
 {
 public:
-    ofxRadioList();
-    ofxRadioList(vector<string> &labels);
-    ofxRadioList(string title, vector<string> &labels);
-    ~ofxRadioList();
+    RadioList();
+    RadioList(vector<string> &labels);
+    RadioList(string title, vector<string> &labels);
+    ~RadioList();
     
     void setup(vector<string> &labels);
     void setup(string title, vector<string> &labels);
@@ -32,7 +34,7 @@ public:
     int size();
     
     // This event notifies about a toggle being selected and passes it's name to the listeners.
-    // Use ofAddListener(ofxRadioListInstance.radioSelectedEvent, listenerClassPtr, &listenerClass::listenerMethod)
+    // Use ofAddListener(RadioListInstance.radioSelectedEvent, listenerClassPtr, &listenerClass::listenerMethod)
     // to listen to this. Listner method void listenerMethod(string & radioName)
     ofEvent<string> radioSelectedEvent;
     
@@ -43,4 +45,6 @@ private:
     int storedSelectedItem;
     
     void onToggleClicked(bool &toggleValue);
-};
\ No newline at end of file
+};
+
+    }}
\ No newline at end of file