diff --git a/ofxProjectGenerator/src/addons/ofAddon.cpp b/ofxProjectGenerator/src/addons/ofAddon.cpp
index 8523d340..3d747f0b 100644
--- a/ofxProjectGenerator/src/addons/ofAddon.cpp
+++ b/ofxProjectGenerator/src/addons/ofAddon.cpp
@@ -5,13 +5,13 @@
  *      Author: arturo
  */
 
-#include "ofAddon.h"
 #include "ofUtils.h"
 #include "ofFileUtils.h"
+#include "ofAddon.h"
 #include "Utils.h"
-#include "Poco/String.h"
 #include "Poco/RegularExpression.h"
 #include <list>
+#include <regex>
 using namespace std;
 
 vector<string> splitStringOnceByLeft(const string &source, const string &delimiter) {
@@ -149,6 +149,15 @@ void ofAddon::addReplaceString(string & variable, string value, bool addToVariab
 }
 
 void ofAddon::addReplaceStringVector(std::vector<std::string> & variable, std::string value, std::string prefix, bool addToVariable){
+	
+//	cout << "======= addReplaceStringVector " << endl;
+//	cout << "value : " << value << endl;
+//	cout << "prefix : " << prefix << endl;
+//	cout << "addToVariable : " << addToVariable << endl;
+//	cout << "___INPUT" << endl;
+//	for (auto & v : variable) {
+//		cout << v << endl;
+//	}
 	vector<string> values;
 	if(value.find("\"")!=string::npos){
 		values = ofSplitString(value,"\"",true,true);
@@ -157,26 +166,62 @@ void ofAddon::addReplaceStringVector(std::vector<std::string> & variable, std::s
 	}
 
 	if(!addToVariable) variable.clear();
-	Poco::RegularExpression regEX("(?<=\\$\\()[^\\)]*");
+//	Poco::RegularExpression regEX("(?<=\\$\\()[^\\)]*");
+	
+	//value : -F$(OF_ROOT)/addons/ofxSyphon/libs/Syphon/lib/osx/
+
+	//\$\(.+\)
+	//(?<=\$\().+(?=\)) // now with positive look behind and look ahead to get rid of $( and )
+//	std::regex findVar("(?<=\\$\().+(?=\\))");
+//	std::regex findVar("\\$\\(.+\\)");
+//	(\$\()(.+)(\)) // now three capture groups here. we use only the second
+	std::regex findVar("(\\$\\()(.+)(\\))");
 	for(int i=0;i<(int)values.size();i++){
 		if(values[i]!=""){
-			Poco::RegularExpression::Match match;
-			if(regEX.match(values[i],match)){
-				string varName = values[i].substr(match.offset,match.length);
-				string varValue;
-				if(varName == "OF_ROOT"){
-					varValue = pathToOF.string();
-				}else if(getenv(varName.c_str())){
-					varValue = getenv(varName.c_str());
+			
+//			cout << values[i] << endl;
+//			cout << "----- VARMATCH" << endl;
+			std::smatch varMatch;
+			if(std::regex_search(values[i], varMatch, findVar)) {
+				if (varMatch.size() > 2) {
+//					cout << ">>> " << varMatch[2].str() << endl;
+					string varName = varMatch[2].str();
+					string varValue;
+					if(varName == "OF_ROOT"){
+						varValue = pathToOF.string();
+					}else if(getenv(varName.c_str())){
+						varValue = getenv(varName.c_str());
+					}
+					ofStringReplace(values[i],"$("+varName+")",varValue);
+					ofLogVerbose("ofAddon") << "addon config: substituting " << varName << " with " << varValue << " = " << values[i] << endl;
 				}
-				ofStringReplace(values[i],"$("+varName+")",varValue);
-				ofLogVerbose("ofAddon") << "addon config: substituting " << varName << " with " << varValue << " = " << values[i] << endl;
 			}
+				
+//			cout << "----- POCO" << endl;
+//			Poco::RegularExpression::Match match;
+//			if(regEX.match(values[i],match)){
+//				string varName = values[i].substr(match.offset,match.length);
+//				cout << "values[i] :: " << values[i] << endl;
+//				cout << "varName :: " << varName << endl;
+//
+//				string varValue;
+//				if(varName == "OF_ROOT"){
+//					varValue = pathToOF.string();
+//				}else if(getenv(varName.c_str())){
+//					varValue = getenv(varName.c_str());
+//				}
+//				ofStringReplace(values[i],"$("+varName+")",varValue);
+//				ofLogVerbose("ofAddon") << "addon config: substituting " << varName << " with " << varValue << " = " << values[i] << endl;
+//			}
 
 			if(prefix=="" || values[i].find(pathToOF.string())==0 || ofFilePath::isAbsolute(values[i])) variable.push_back(values[i]);
 			else variable.push_back(ofFilePath::join(prefix,values[i]));
 		}
 	}
+//	cout << "___OUTPUT" << endl;
+//	for (auto & v : variable) {
+//		cout << v << endl;
+//	}
 }
 
 void ofAddon::addReplaceStringVector(vector<LibraryBinary> & variable, string value, string prefix, bool addToVariable) {
@@ -229,6 +274,10 @@ void ofAddon::parseVariableValue(string variable, string value, bool addToValue,
 	if (!isLocalAddon) {
 		// addonRelPath = ofFilePath::addTrailingSlash(pathToOF) + "addons/" + name;
 		addonRelPath = pathToOF / "addons" / name;
+//		cout << "-----> this is not local addon" << endl;
+//		cout << pathToOF << endl;
+//		cout << addonRelPath << endl;
+
 	}
 	else addonRelPath = addonPath;
 
@@ -366,10 +415,8 @@ void ofAddon::exclude(vector<LibraryBinary> & variables, vector<string> exclusio
 void ofAddon::parseConfig(){
 	ofFile addonConfig;
 	if(isLocalAddon){
-		// addonConfig.open(ofFilePath::join(ofFilePath::join(pathToProject,addonPath),"addon_config.mk"));
 		addonConfig.open(pathToProject / addonPath / "addon_config.mk");
 	}else{
-		// addonConfig.open(ofFilePath::join(addonPath,"addon_config.mk"));
 		addonConfig.open(addonPath / "addon_config.mk");
 	}
 
@@ -414,8 +461,8 @@ void ofAddon::parseConfig(){
 				addToValue = false;
 				varValue = splitStringOnceByLeft(line,"=");
 			}
-			variable = Poco::trim(varValue[0]);
-			value = Poco::trim(varValue[1]);
+			variable = ofTrim(varValue[0]);
+			value = ofTrim(varValue[1]);
 
 			if(!checkCorrectPlatform(currentParseState)){
 				continue;
@@ -472,51 +519,62 @@ bool ofAddon::fromFS(of::filesystem::path path, const std::string & platform){
 	}
 
 	auto srcPath = path / "src";
-	ofLogVerbose() << "in fromFS, trying src " << srcPath;
+
 	if (ofDirectory(srcPath).exists()){
 		getFilesRecursively(srcPath, srcFiles);
 	}
 
-	for(int i=0;i<(int)srcFiles.size();i++){
-		srcFiles[i].erase(srcFiles[i].begin(), srcFiles[i].begin() + containedPath.string().length());
-		int end = srcFiles[i].rfind(of::filesystem::path("/").make_preferred().string());
-		int init = 0;
-		string folder;
-		if(!isLocalAddon){
-			folder = srcFiles[i].substr(init,end);
-		}else{
-			init = srcFiles[i].find(name);
-			folder = ofFilePath::join("local_addons", srcFiles[i].substr(init,end-init));
+	// FIXME: srcFiles to fs::path
+	for (auto & s : srcFiles) {
+		of::filesystem::path folder;
+		if (isLocalAddon) {
+			// FIXME: test if local addons is working ok
+			folder = of::filesystem::path("local_addons") / of::filesystem::path(s).parent_path();
+		} else {
+			folder = of::filesystem::path(s).parent_path();
+			folder = of::filesystem::relative(folder, containedPath);
 		}
-		srcFiles[i] = prefixPath.string() + srcFiles[i];
-		filesToFolders[srcFiles[i]] = folder;
+		s = of::filesystem::path(prefixPath / of::filesystem::relative(s, containedPath)).string();
+		filesToFolders[s] = folder.string();
 	}
 	
 
 	if (platform == "vs" || platform == "msys2") {
 		getPropsRecursively(addonPath.string(), propsFiles, platform);
 	}
-
-	for (int i = 0; i < (int)propsFiles.size(); i++) {
-		propsFiles[i].erase(propsFiles[i].begin(), propsFiles[i].begin() + containedPath.string().length());
-		int end = propsFiles[i].rfind(of::filesystem::path("/").make_preferred().string());
-		int init = 0;
-		string folder;
-		if (!isLocalAddon) {
-			folder = propsFiles[i].substr(init, end);
-		}
-		else {
-			init = propsFiles[i].find(name);
-			folder = ofFilePath::join("local_addons", propsFiles[i].substr(init, end - init));
+	
+	// FIXME: propsFiles to fs::path
+	for (auto & s : propsFiles) {
+		of::filesystem::path folder;
+		if (isLocalAddon) {
+			// FIXME: test if local addons is working ok
+			folder = of::filesystem::path("local_addons") / of::filesystem::path(s).parent_path();
+		} else {
+			folder = of::filesystem::path(s).parent_path();
+			folder = of::filesystem::relative(folder, containedPath);
 		}
-		propsFiles[i] = prefixPath.string() + propsFiles[i];
-	}
+		s = of::filesystem::path(prefixPath / of::filesystem::relative(s, containedPath)).string();
+	}
+
+//	for (int i = 0; i < (int)propsFiles.size(); i++) {
+//		propsFiles[i].erase(propsFiles[i].begin(), propsFiles[i].begin() + containedPath.string().length());
+//		int end = propsFiles[i].rfind(of::filesystem::path("/").make_preferred().string());
+//		int init = 0;
+//		string folder;
+//		if (!isLocalAddon) {
+//			folder = propsFiles[i].substr(init, end);
+//		}
+//		else {
+//			init = propsFiles[i].find(name);
+//			folder = ofFilePath::join("local_addons", propsFiles[i].substr(init, end - init));
+//		}
+//		propsFiles[i] = prefixPath.string() + propsFiles[i];
+//	}
 	
 
-	string libsPath = ofFilePath::join(path, "/libs");
+	of::filesystem::path libsPath = path / "libs";
 	vector < string > libFiles;
 
-
 	if (ofDirectory(libsPath).exists()){
 		getLibsRecursively(libsPath, libFiles, libs, platform);
 
@@ -527,44 +585,42 @@ bool ofAddon::fromFS(of::filesystem::path path, const std::string & platform){
 		if(platform == "vs" || platform == "msys2"){
 			getDllsRecursively(libsPath, dllsToCopy, platform);
 		}
-
 	}
 	
-
-	// I need to add libFiles to srcFiles
-	for (int i = 0; i < (int)libFiles.size(); i++){
-		libFiles[i].erase (libFiles[i].begin(), libFiles[i].begin() + containedPath.string().length());
-		//ofLogVerbose() << " libFiles " << libFiles[i];
-		int init = 0;
-		int end = libFiles[i].rfind(of::filesystem::path("/").make_preferred().string());
-		if (end > 0){
-			string folder;
-			if (!isLocalAddon) {
-				folder = libFiles[i].substr(init, end);
-			}
-			else {
-				init = libFiles[i].find(name);
-				folder = ofFilePath::join("local_addons", libFiles[i].substr(init, end - init));
-			}
-			libFiles[i] = prefixPath.string() + libFiles[i];
-			srcFiles.push_back(libFiles[i]);
-			filesToFolders[libFiles[i]] = folder;
+	
+	for (auto & s : libFiles) {
+		of::filesystem::path folder;
+		if (isLocalAddon) {
+			// FIXME: test if local addons is working ok
+			folder = of::filesystem::path("local_addons") / of::filesystem::path(s).parent_path();
+		} else {
+			folder = of::filesystem::path(s).parent_path();
+			folder = of::filesystem::relative(folder, containedPath);
 		}
-
+		s = of::filesystem::path(prefixPath / of::filesystem::relative(s, containedPath)).string();
+		srcFiles.emplace_back(s);
+		filesToFolders[s] = folder.string();
 	}
-
-	
 	
-	for (int i = 0; i < (int)libs.size(); i++){
-
-		// does libs[] have any path ? let's fix if so.
-		int end = libs[i].path.rfind(of::filesystem::path("/").make_preferred().string());
-		if (end > 0){
-			libs[i].path.erase (libs[i].path.begin(), libs[i].path.begin() + containedPath.string().length());
-			libs[i].path = prefixPath.string() + libs[i].path;
-		}
 
+	// changing libs folder from absolute to relative.
+	for (auto & l : libs) {
+		l.path = of::filesystem::path(prefixPath / of::filesystem::relative(l.path, containedPath)).string();
 	}
+	
+	
+//	for (int i = 0; i < (int)libs.size(); i++){
+//
+//		cout << "libs path before " <<  libs[i].path << endl;
+//		// does libs[] have any path ? let's fix if so.
+//		int end = libs[i].path.rfind(of::filesystem::path("/").make_preferred().string());
+//		if (end > 0){
+//			libs[i].path.erase (libs[i].path.begin(), libs[i].path.begin() + containedPath.string().length());
+//			libs[i].path = prefixPath.string() + libs[i].path;
+//		}
+//		cout << "libs path after " <<  libs[i].path << endl;
+//
+//	}
 
 	for (int i = 0; i < (int)frameworks.size(); i++){
 
@@ -605,24 +661,11 @@ bool ofAddon::fromFS(of::filesystem::path path, const std::string & platform){
 			filesToFolders[frameworks[i]] = folder;
 
 		}
-		
-	   
-
-	}
-
-
-
-
-
-
-	// get a unique list of the paths that are needed for the includes.
-	list < string > paths;
-	for (int i = 0; i < (int)srcFiles.size(); i++){
-		size_t found;
-		found = srcFiles[i].find_last_of(of::filesystem::path("/").make_preferred().string());
-		paths.push_back(srcFiles[i].substr(0,found));
 	}
 
+	// paths that are needed for the includes.
+	list < of::filesystem::path > paths;
+	
 	// get every folder in addon/src and addon/libs
 	vector < string > libFolders;
 	if(ofDirectory(libsPath).exists()){
@@ -631,25 +674,23 @@ bool ofAddon::fromFS(of::filesystem::path path, const std::string & platform){
 
 	vector < string > srcFolders;
 	if(ofDirectory(srcPath).exists()){
-		getFoldersRecursively(ofFilePath::join(path, "/src"), srcFolders, platform);
+		getFoldersRecursively(path / "src", srcFolders, platform);
 	}
 
-	for (int i = 0; i < (int)libFolders.size(); i++){
-		libFolders[i].erase (libFolders[i].begin(), libFolders[i].begin() + containedPath.string().length());
-		libFolders[i] = prefixPath.string() + libFolders[i];
-		paths.push_back(libFolders[i]);
+	// convert paths to relative
+	for (auto & l : libFolders) {
+		paths.push_back({ prefixPath / of::filesystem::relative(of::filesystem::path(l), containedPath) });
 	}
 
-	for (int i = 0; i < (int)srcFolders.size(); i++){
-		srcFolders[i].erase (srcFolders[i].begin(), srcFolders[i].begin() + containedPath.string().length());
-		srcFolders[i] = prefixPath.string() + srcFolders[i];
-		paths.push_back(srcFolders[i]);
+	for (auto & l : srcFolders) {
+		paths.push_back({ prefixPath / of::filesystem::relative(of::filesystem::path(l), containedPath) });
 	}
 
-	paths.sort();
-	paths.unique();
-	for (list<string>::iterator it=paths.begin(); it!=paths.end(); ++it){
-		includePaths.push_back(*it);
+	paths.sort(); //paths.unique(); // unique not needed anymore. everything is carefully inserted now.
+
+	for (auto & p : paths) {
+//		cout << p << endl;
+		includePaths.emplace_back(p.string());
 	}
 
 	parseConfig();
@@ -657,37 +698,6 @@ bool ofAddon::fromFS(of::filesystem::path path, const std::string & platform){
 	return true;
 }
 
-//void ofAddon::fromXML(string installXmlName){
-//	clear();
-//    pugi::xml_document doc;
-//    pugi::xml_parse_result result = doc.load_file(ofToDataPath(installXmlName).c_str());
-
-//    // this is src to add:
-//    pugi::xpath_node_set add = doc.select_nodes("//add/src/folder/file");
-//    for (pugi::xpath_node_set::const_iterator it = add.begin(); it != add.end(); ++it){
-//        pugi::xpath_node node = *it;
-//        //std::cout << "folder name "  << node.node().parent().attribute("name").value() << " : ";
-//        //std::cout << "src: " << node.node().child_value() << endl;
-//    }
-
-
-//    add = doc.select_nodes("//include/path");
-//    for (pugi::xpath_node_set::const_iterator it = add.begin(); it != add.end(); ++it){
-//        pugi::xpath_node node = *it;
-//        //std::cout << "include: " << node.node().child_value() << endl;
-//    }
-
-
-//    add = doc.select_nodes("//link/lib[@compiler='codeblocks']");
-//    // this has to be smarter I guess...
-//    for (pugi::xpath_node_set::const_iterator it = add.begin(); it != add.end(); ++it){
-//        pugi::xpath_node node = *it;
-//        //std::cout << "link: " << node.node().child_value() << endl;
-//    }
-
-
-//}
-
 
 void ofAddon::clear(){
 	filesToFolders.clear();
diff --git a/ofxProjectGenerator/src/projects/CBLinuxProject.cpp b/ofxProjectGenerator/src/projects/CBLinuxProject.cpp
index 1808fd09..e53d121d 100644
--- a/ofxProjectGenerator/src/projects/CBLinuxProject.cpp
+++ b/ofxProjectGenerator/src/projects/CBLinuxProject.cpp
@@ -72,8 +72,8 @@ bool CBLinuxProject::createProjectFile(){
     if (relRoot != "../../../"){
         std::string relPath2 = relRoot;
         relPath2.erase(relPath2.end()-1);
-        findandreplaceInTexfile(projectDir + "Makefile", "../../..", relPath2);
-        findandreplaceInTexfile(projectDir + "config.make", "../../..", relPath2);
+        findandreplaceInTexfile(projectDir / "Makefile", "../../..", relPath2);
+        findandreplaceInTexfile(projectDir / "config.make", "../../..", relPath2);
         findandreplaceInTexfile(ofFilePath::join(projectDir , projectName + ".workspace"), "../../../", relRoot);
         findandreplaceInTexfile(ofFilePath::join(projectDir , projectName + ".cbp"), "../../../", relRoot);
     }
diff --git a/ofxProjectGenerator/src/projects/CBWinProject.cpp b/ofxProjectGenerator/src/projects/CBWinProject.cpp
index cee2a882..bf67ba64 100644
--- a/ofxProjectGenerator/src/projects/CBWinProject.cpp
+++ b/ofxProjectGenerator/src/projects/CBWinProject.cpp
@@ -13,14 +13,14 @@
 std::string CBWinProject::LOG_NAME = "CBWinProject";
 bool CBWinProject::createProjectFile(){
 
-    std::string project = projectDir + projectName + ".cbp";
-    std::string workspace = projectDir + projectName + ".workspace";
+	auto project = projectDir / (projectName + ".cbp");
+    auto workspace = projectDir / (projectName + ".workspace");
 
 
 	ofFile::copyFromTo(ofFilePath::join(templatePath,"emptyExample.cbp"),project, false, true);
 
 	ofFile::copyFromTo(ofFilePath::join(templatePath,"emptyExample.workspace"),workspace, false, true);
-	ofFile::copyFromTo(ofFilePath::join(templatePath,"icon.rc"), projectDir + "icon.rc", false, true);
+	ofFile::copyFromTo(ofFilePath::join(templatePath,"icon.rc"), projectDir / "icon.rc", false, true);
 
     //let's do some renaming:
     std::string relRoot = getOFRelPath(ofFilePath::removeTrailingSlash(projectDir));
@@ -48,7 +48,7 @@ bool CBWinProject::loadProjectFile(){
 
     //project.open(ofFilePath::join(projectDir , projectName + ".cbp"));
 
-    ofFile project(projectDir + projectName + ".cbp");
+    ofFile project(projectDir / (projectName + ".cbp"));
 	if(!project.exists()){
 		ofLogError(LOG_NAME) << "error loading" << project.path() << "doesn't exist";
 		return false;
@@ -67,7 +67,7 @@ bool CBWinProject::saveProjectFile(){
             ofLogError(LOG_NAME) << "can't set title";
         }
     }
-    return doc.save_file((projectDir + projectName + ".cbp").c_str());
+    return doc.save_file((projectDir / (projectName + ".cbp")).c_str());
 }
 
 void CBWinProject::addSrc(std::string srcName, std::string folder, SrcType type){
@@ -92,6 +92,6 @@ std::string CBWinProject::getName(){
 	return projectName;
 }
 
-std::string CBWinProject::getPath(){
+of::filesystem::path CBWinProject::getPath(){
 	return projectDir;
 }
diff --git a/ofxProjectGenerator/src/projects/CBWinProject.h b/ofxProjectGenerator/src/projects/CBWinProject.h
index 36b45dca..167633b7 100644
--- a/ofxProjectGenerator/src/projects/CBWinProject.h
+++ b/ofxProjectGenerator/src/projects/CBWinProject.h
@@ -25,7 +25,7 @@ class CBWinProject: public baseProject  {
 	void addLibrary(const LibraryBinary & lib);
 
 	std::string getName();
-	std::string getPath();
+	of::filesystem::path getPath();
 
 	static std::string LOG_NAME;
 
diff --git a/ofxProjectGenerator/src/projects/baseProject.cpp b/ofxProjectGenerator/src/projects/baseProject.cpp
index 8a2bdd43..8685a25a 100644
--- a/ofxProjectGenerator/src/projects/baseProject.cpp
+++ b/ofxProjectGenerator/src/projects/baseProject.cpp
@@ -109,17 +109,15 @@ vector<baseProject::Template> baseProject::listAvailableTemplates(std::string ta
 	return templates;
 }
 
-// FIXME: substitute to of::filesystem
-bool baseProject::create(string path, std::string templateName){
-	cout << "baseProject::create " << path << endl;
+bool baseProject::create(const of::filesystem::path & _path, std::string templateName){
 	templatePath = getPlatformTemplateDir();
 	addons.clear();
 	extSrcPaths.clear();
+	auto path = _path;
 
 	if(!ofFilePath::isAbsolute(path)){
 		path = (of::filesystem::current_path() / of::filesystem::path(path)).string();
 	}
-	// projectDir = ofFilePath::addTrailingSlash(path);
 	projectDir = path;
 
 	projectName = ofFilePath::getFileName(path);
@@ -160,68 +158,39 @@ bool baseProject::create(string path, std::string templateName){
 	parseConfigMake();
 
 	if (bDoesDirExist){
+		
 		vector < string > fileNames;
-		getFilesRecursively(ofFilePath::join(projectDir , "src"), fileNames);
-
-		for (int i = 0; i < (int)fileNames.size(); i++){
-
-			fileNames[i].erase(fileNames[i].begin(), fileNames[i].begin() + projectDir.length());
+		getFilesRecursively(projectDir / "src", fileNames);
 
-			string first, last;
-#ifdef TARGET_WIN32
-			splitFromLast(fileNames[i], "\\", first, last);
-#else
-			splitFromLast(fileNames[i], "/", first, last);
-#endif
-			if (fileNames[i] != "src/ofApp.cpp" &&
-				fileNames[i] != "src/ofApp.h" &&
-				fileNames[i] != "src/main.cpp" &&
-				fileNames[i] != "src/ofApp.mm" &&
-				fileNames[i] != "src/main.mm"){
-				addSrc(fileNames[i], first);
+		for (auto & f : fileNames) {
+			of::filesystem::path rel { of::filesystem::relative(f, projectDir) };
+			of::filesystem::path folder { rel.parent_path() };
+			
+			std::string fileName = rel.string();
+			
+			if (fileName != "src/ofApp.cpp" &&
+				fileName != "src/ofApp.h" &&
+				fileName != "src/main.cpp" &&
+				fileName != "src/ofApp.mm" &&
+				fileName != "src/main.mm") {
+//				cout << "add filename:: " << rel << " :: " << folder << endl;
+				addSrc(rel.string(), folder.string());
+			} else {
+//				cout << "not adding filename:: " << rel << " :: " << folder << endl;
 			}
 		}
 
-//		if( target == "ios" ){
-//			getFilesRecursively(ofFilePath::join(projectDir , "bin/data"), fileNames);
-//
-//	        for (int i = 0; i < (int)fileNames.size(); i++){
-//				fileNames[i].erase(fileNames[i].begin(), fileNames[i].begin() + projectDir.length());
-//
-//				string first, last;
-//				splitFromLast(fileNames[i], "/", first, last);
-//				if (fileNames[i] != "Default.png" &&
-//					fileNames[i] != "src/ofApp.h" &&
-//					fileNames[i] != "src/main.cpp" &&
-//					fileNames[i] != "src/ofApp.mm" &&
-//					fileNames[i] != "src/main.mm"){
-//					addSrc(fileNames[i], first);
-//				}
-//			}
-//		}
-
-		// get a unique list of the paths that are needed for the includes.
-		list < string > paths;
-		vector < string > includePaths;
-		for (int i = 0; i < (int)fileNames.size(); i++){
-			size_t found;
-	#ifdef TARGET_WIN32
-			found = fileNames[i].find_last_of("\\");
-	#else
-			found = fileNames[i].find_last_of("/");
-	#endif
-			paths.push_back(fileNames[i].substr(0,found));
-		}
-
-		paths.sort();
-		paths.unique();
-		for (list<string>::iterator it=paths.begin(); it!=paths.end(); ++it){
-			includePaths.push_back(*it);
-		}
-
-		for (int i = 0; i < includePaths.size(); i++){
-			addInclude(includePaths[i]);
+		// only add unique paths
+		std::vector < of::filesystem::path > paths;
+		for (auto & f : fileNames) {
+			auto dir = of::filesystem::path(f).parent_path().filename();
+			if (std::find(paths.begin(), paths.end(), dir) == paths.end()) {
+				paths.emplace_back(dir);
+//				cout << "addInclude " << dir << endl;
+				addInclude(dir.string());
+			}
 		}
+		
 	}
 	return true;
 }
@@ -277,7 +246,9 @@ bool baseProject::isAddonInCache(const std::string & addonPath, const std::strin
 
 void baseProject::addAddon(std::string addonName){
 	ofAddon addon;
-	addon.pathToOF = getOFRelPath(projectDir);
+//	cout << projectDir << endl;
+	addon.pathToOF = getOFRelPath(projectDir.string());
+//	cout << addon.pathToOF << endl;
 	addon.pathToProject = ofFilePath::getAbsolutePath(projectDir);
 
 	auto localPath = ofFilePath::join(addon.pathToProject, addonName);
@@ -383,7 +354,7 @@ void baseProject::addSrcRecursively(std::string srcPath){
 	
 	std::map <std::string, std::string> uniqueIncludeFolders;
 	for( auto & fileToAdd : srcFilesToAdd){
-				
+//		cout << "fileToAdd :: " << fileToAdd << endl;
 		//if it is an absolute path it is easy - add the file and enclosing folder to the project
 		if( ofFilePath::isAbsolute(fileToAdd) && !bMakeRelative ){
 			string folder = ofFilePath::getEnclosingDirectory(fileToAdd,false);
@@ -427,6 +398,7 @@ void baseProject::addSrcRecursively(std::string srcPath){
 			folder =  ofFilePath::removeTrailingSlash(folder);
 
 			ofLogVerbose() <<  " adding file " << fileToAdd << " in folder " << folder << " to project ";
+			
 			addSrc(relPathPathToAdd, folder);
 			uniqueIncludeFolders[includeFolder] = includeFolder;
 		}
@@ -435,6 +407,7 @@ void baseProject::addSrcRecursively(std::string srcPath){
 	//do it this way so we don't try and add a include folder for each file ( as it checks if they are already added ) so should be faster
 	for(auto & includeFolder : uniqueIncludeFolders){
 		ofLogVerbose() << " adding search include paths for folder " << includeFolder.second;
+		cout << "includeFolder.second " << includeFolder.second << endl;
 		addInclude(includeFolder.second);
 	}
 }
diff --git a/ofxProjectGenerator/src/projects/baseProject.h b/ofxProjectGenerator/src/projects/baseProject.h
index 2dca5ebf..b21dd726 100644
--- a/ofxProjectGenerator/src/projects/baseProject.h
+++ b/ofxProjectGenerator/src/projects/baseProject.h
@@ -39,7 +39,7 @@ class baseProject {
 
 	virtual ~baseProject(){}
 
-	bool create(std::string path, std::string templateName="");
+	bool create(const of::filesystem::path & path, std::string templateName="");
 	void parseAddons();
 	void parseConfigMake();
 	bool save();
@@ -70,7 +70,8 @@ class baseProject {
 	virtual void addSrcRecursively(std::string srcPath);
 
 	std::string getName() { return projectName;}
-	std::string getPath() { return projectDir; }
+//	std::string getPath() { return projectDir; }
+	of::filesystem::path getPath() { return projectDir; }
 
 	std::vector<Template> listAvailableTemplates(std::string target);
 	std::unique_ptr<baseProject::Template> parseTemplate(const ofDirectory & templateDir);
@@ -79,7 +80,7 @@ class baseProject {
 	pugi::xml_document doc;
 	bool bLoaded;
 
-	std::string projectDir;
+	of::filesystem::path projectDir;
 	std::string projectName;
 	std::string templatePath;
 	std::string target;
diff --git a/ofxProjectGenerator/src/projects/qtcreatorproject.cpp b/ofxProjectGenerator/src/projects/qtcreatorproject.cpp
index 170cd4b2..7e514c19 100644
--- a/ofxProjectGenerator/src/projects/qtcreatorproject.cpp
+++ b/ofxProjectGenerator/src/projects/qtcreatorproject.cpp
@@ -54,9 +54,9 @@ bool QtCreatorProject::createProjectFile(){
 	if (relRoot != "../../../"){
 		std::string relPath2 = relRoot;
 		relPath2.erase(relPath2.end()-1);
-		findandreplaceInTexfile(projectDir + "qtcreator.qbs", "../../..", relPath2);
-		findandreplaceInTexfile(projectDir + "Makefile", "../../..", relPath2);
-		findandreplaceInTexfile(projectDir + "config.make", "../../..", relPath2);
+		findandreplaceInTexfile(projectDir / "qtcreator.qbs", "../../..", relPath2);
+		findandreplaceInTexfile(projectDir / "Makefile", "../../..", relPath2);
+		findandreplaceInTexfile(projectDir / "config.make", "../../..", relPath2);
 	}
 
 	return true;
@@ -67,7 +67,7 @@ void QtCreatorProject::addSrc(std::string srcFile, std::string folder, baseProje
 }
 
 bool QtCreatorProject::loadProjectFile(){
-	ofFile project(projectDir + projectName + ".qbs",ofFile::ReadOnly,true);
+	ofFile project(projectDir / (projectName + ".qbs"),ofFile::ReadOnly,true);
 	if(!project.exists()){
 		ofLogError(LOG_NAME) << "error loading" << project.path() << "doesn't exist";
 		return false;
@@ -139,7 +139,7 @@ bool QtCreatorProject::saveProjectFile(){
 
 	// save final project
 	qbs.set(qbsStr);
-	ofFile project(projectDir + projectName + ".qbs",ofFile::WriteOnly,true);
+	ofFile project(projectDir / (projectName + ".qbs"),ofFile::WriteOnly,true);
 	project.writeFromBuffer(qbs);
 	return true;
 }
diff --git a/ofxProjectGenerator/src/projects/visualStudioProject.cpp b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
index 0629348a..9111d2e6 100644
--- a/ofxProjectGenerator/src/projects/visualStudioProject.cpp
+++ b/ofxProjectGenerator/src/projects/visualStudioProject.cpp
@@ -18,7 +18,7 @@ bool visualStudioProject::createProjectFile(){
 	ofFile::copyFromTo(ofFilePath::join(templatePath,"emptyExample.vcxproj.user"),user, false, true);
 	ofFile::copyFromTo(ofFilePath::join(templatePath,"emptyExample.sln"),solution, false, true);
 	ofFile::copyFromTo(ofFilePath::join(templatePath,"emptyExample.vcxproj.filters"),filters, false, true);
-	ofFile::copyFromTo(ofFilePath::join(templatePath,"icon.rc"), projectDir + "icon.rc", false, true);
+	ofFile::copyFromTo(ofFilePath::join(templatePath,"icon.rc"), projectDir / "icon.rc", false, true);
 
 	ofFile filterFile(filters);
 	std::string temp = filterFile.readToBuffer();
@@ -54,7 +54,7 @@ bool visualStudioProject::createProjectFile(){
 
 bool visualStudioProject::loadProjectFile(){
 
-	ofFile project(projectDir + projectName + ".vcxproj");
+	ofFile project(projectDir / (projectName + ".vcxproj"));
 	if(!project.exists()){
 		ofLogError(LOG_NAME) << "error loading " << project.path() << " doesn't exist";
 		return false;
@@ -67,11 +67,11 @@ bool visualStudioProject::loadProjectFile(){
 
 bool visualStudioProject::saveProjectFile(){
 
-	std::string filters = projectDir + projectName + ".vcxproj.filters";
+	auto filters = projectDir / (projectName + ".vcxproj.filters");
 	filterXmlDoc.save_file(filters.c_str());
 
 
-	return doc.save_file((projectDir + projectName + ".vcxproj").c_str());
+	return doc.save_file((projectDir / (projectName + ".vcxproj")).c_str());
 }
 
 
diff --git a/ofxProjectGenerator/src/projects/xcodeProject.cpp b/ofxProjectGenerator/src/projects/xcodeProject.cpp
index de949a1f..8c29225b 100644
--- a/ofxProjectGenerator/src/projects/xcodeProject.cpp
+++ b/ofxProjectGenerator/src/projects/xcodeProject.cpp
@@ -61,9 +61,9 @@ xcodeProject::xcodeProject(string target)
 	}
 };
 
-
 bool xcodeProject::createProjectFile(){
-	string xcodeProject = ofFilePath::join(projectDir , projectName + ".xcodeproj");
+	//	cout << "createProjectFile() xcodeProject " << xcodeProject << endl;
+	of::filesystem::path xcodeProject = projectDir / ( projectName + ".xcodeproj" );
 	
 	if (ofDirectory::doesDirectoryExist(xcodeProject)){
 		ofDirectory::removeDirectory(xcodeProject, true);
@@ -127,28 +127,22 @@ bool xcodeProject::createProjectFile(){
 	}
 
 	// make everything relative the right way.
-	string relRoot = getOFRelPath(ofFilePath::removeTrailingSlash(projectDir));
-//	string relRoot = "$(OF_ROOT)" + ofFilePath::removeTrailingSlash(projectDir);
-//	std::cout << "relRoot = " << relRoot << std::endl;
+	string relRoot = getOFRelPathFS(projectDir).string();
 	
-	if (relRoot != "../../../"){
-		cout << "FIXING PATHS" << endl;
-		string relPath2 = relRoot;
-		
-		relPath2.erase(relPath2.end()-1);
-		findandreplaceInTexfile(projectDir + projectName + ".xcodeproj/project.pbxproj", "../../..", relPath2);
-		//findandreplaceInTexfile(projectDir + "Project.xcconfig", "../../../", relRoot);
-		findandreplaceInTexfile(projectDir + "Project.xcconfig", "../../..", relPath2);
+	if (relRoot != "../../.."){
+
+		findandreplaceInTexfile(projectDir / projectName / ".xcodeproj/project.pbxproj", "../../..", relRoot);
+		findandreplaceInTexfile(projectDir / "Project.xcconfig", "../../..", relRoot);
 		if( target == "osx" ){
-			findandreplaceInTexfile(projectDir + "Makefile", "../../..", relPath2);
-			findandreplaceInTexfile(projectDir + "config.make", "../../..", relPath2);
+			findandreplaceInTexfile(projectDir / "Makefile", "../../..", relRoot);
+			findandreplaceInTexfile(projectDir / "config.make", "../../..", relRoot);
 		}
 	}
 	return true;
 }
 
 void xcodeProject::saveScheme(){
-	string schemeFolder = projectDir + projectName + ".xcodeproj" + "/xcshareddata/xcschemes/";
+	auto schemeFolder = projectDir / ( projectName + ".xcodeproj" ) / "xcshareddata/xcschemes";
 	if (ofDirectory::doesDirectoryExist(schemeFolder)){
 		ofDirectory::removeDirectory(schemeFolder, true);
 	}
@@ -156,17 +150,17 @@ void xcodeProject::saveScheme(){
 	
 	if(target=="osx"){
 		for (auto & f : { string("Release"), string("Debug") }) {
-			string schemeTo = schemeFolder + projectName + " " +f+ ".xcscheme";
+			auto schemeTo = schemeFolder / (projectName + " " +f+ ".xcscheme");
 			ofFile::copyFromTo(ofFilePath::join(templatePath, "emptyExample.xcodeproj/xcshareddata/xcschemes/emptyExample "+f+".xcscheme"), schemeTo);
 			findandreplaceInTexfile(schemeTo, "emptyExample", projectName);
 		}
 	 
-		string workspaceTo = projectDir  + projectName + ".xcodeproj/project.xcworkspace";
+		auto workspaceTo = projectDir / (projectName + ".xcodeproj/project.xcworkspace");
 		ofFile::copyFromTo(ofFilePath::join(templatePath, "emptyExample.xcodeproj/project.xcworkspace"), workspaceTo);
 	}else{
 
 		// MARK:- IOS sector;
-		string schemeTo = schemeFolder + projectName + ".xcscheme";
+		auto schemeTo = schemeFolder / (projectName + ".xcscheme");
 		ofFile::copyFromTo(ofFilePath::join(templatePath, "emptyExample.xcodeproj/xcshareddata/xcschemes/emptyExample.xcscheme"), schemeTo);
 		findandreplaceInTexfile(schemeTo, "emptyExample", projectName);
 	}
@@ -220,7 +214,8 @@ string xcodeProject::getFolderUUID(string folder) {
 					commands.emplace_back("Add :objects:"+thisUUID+":isa string PBXGroup");
 					commands.emplace_back("Add :objects:"+thisUUID+":name string "+folders[a]);
 					commands.emplace_back("Add :objects:"+thisUUID+":children array");
-					commands.emplace_back("Add :objects:"+thisUUID+":sourceTree string <group>");
+//					commands.emplace_back("Add :objects:"+thisUUID+":sourceTree string <group>");
+					commands.emplace_back("Add :objects:"+thisUUID+":sourceTree string SOURCE_ROOT");
 
 					// And this new object is cointained in parent hierarchy, or even projRootUUID
 					commands.emplace_back("Add :objects:"+lastFolderUUID+":children: string " + thisUUID);
@@ -509,16 +504,13 @@ void xcodeProject::addFramework(string name, string path, string folder){
 }
 
 void xcodeProject::addInclude(string includeName){
+
+//	string relRoot = getOFRelPathFS(projectDir).string();
+//	ofStringReplace(includeName, relRoot, "$(OF_PATH)");
 	
-	//
-	cout << "-----" << endl;
-	cout << getOFRoot() << endl;
-	cout << "$(OF_PATH)" << endl;
-	ofStringReplace(includeName, getOFRoot(), "$(OF_PATH)");
 	// Adding source to all build configurations, debug and release
 	for (auto & c : buildConfigurations) {
 		string s = "Add :objects:"+c+":buildSettings:HEADER_SEARCH_PATHS: string " + includeName;
-		std::cout << s << std::endl;
 		commands.emplace_back("Add :objects:"+c+":buildSettings:HEADER_SEARCH_PATHS: string " + includeName);
 	}
 }
@@ -578,7 +570,6 @@ void xcodeProject::addAfterRule(string rule){
 
 void xcodeProject::addAddon(ofAddon & addon){
 	
-	
 	for(int i=0;i<(int)addons.size();i++){
 		if(addons[i].name==addon.name){
 			return;
@@ -600,39 +591,46 @@ void xcodeProject::addAddon(ofAddon & addon){
 		}
 	}
 	
-
-	
 	addons.push_back(addon);
 
-	for(int i=0;i<(int)addon.includePaths.size();i++){
-//		ofLogVerbose() << "adding addon include path: " << addon.includePaths[i];
-		ofLog() << "adding addon include path: " << addon.includePaths[i];
-		addInclude(addon.includePaths[i]);
+	for (auto & e : addon.includePaths) {
+		ofLogVerbose() << "adding addon include path: " << e;
+//		ofLog() << "adding addon include path: " << e;
+		addInclude(e);
 	}
-	for(int i=0;i<(int)addon.libs.size();i++){
-		ofLogVerbose() << "adding addon libs: " << addon.libs[i].path;
-		addLibrary(addon.libs[i]);
+	
+	for (auto & e : addon.libs) {
+		ofLogVerbose() << "adding addon libs: " << e.path;
+		addLibrary(e);
 	}
-	for(int i=0;i<(int)addon.cflags.size();i++){
-		ofLogVerbose() << "adding addon cflags: " << addon.cflags[i];
-		addCFLAG(addon.cflags[i]);
+	
+	for (auto & e : addon.cflags) {
+		ofLogVerbose() << "adding addon cflags: " << e;
+		addCFLAG(e);
 	}
-	for(int i=0;i<(int)addon.cppflags.size();i++){
-		ofLogVerbose() << "adding addon cppflags: " << addon.cppflags[i];
-		addCPPFLAG(addon.cppflags[i]);
+
+	for (auto & e : addon.cppflags) {
+		ofLogVerbose() << "adding addon cppflags: " << e;
+		addCPPFLAG(e);
 	}
-	for(int i=0;i<(int)addon.ldflags.size();i++){
-		ofLogVerbose() << "adding addon ldflags: " << addon.ldflags[i];
-		addLDFLAG(addon.ldflags[i]);
+	
+	for (auto & e : addon.ldflags) {
+		ofLogVerbose() << "adding addon ldflags: " << e;
+		addLDFLAG(e);
 	}
+
 	std::sort(addon.srcFiles.begin(), addon.srcFiles.end(), std::less<string>());
-	for(int i=0;i<(int)addon.srcFiles.size(); i++){
-		ofLogVerbose() << "adding addon srcFiles: " << addon.srcFiles[i];
-		addSrc(addon.srcFiles[i],addon.filesToFolders[addon.srcFiles[i]]);
+	
+	for (auto & e : addon.srcFiles) {
+		ofLogVerbose() << "adding addon srcFiles: " << e;
+		// FIXME: - we can eliminate filesToFolders later with a proper function to do that.
+		// maybe even eliminate addSrc second parameter
+		addSrc(e,addon.filesToFolders[e]);
 	}
-	for(int i=0;i<(int)addon.defines.size(); i++){
-		ofLogVerbose() << "adding addon defines: " << addon.defines[i];
-		addDefine(addon.defines[i]);
+	
+	for (auto & e : addon.defines) {
+		ofLogVerbose() << "adding addon defines: " << e;
+		addDefine(e);
 	}
 
 	for(int i=0;i<(int)addon.frameworks.size(); i++){
@@ -666,14 +664,14 @@ void xcodeProject::addAddon(ofAddon & addon){
 }
 
 bool xcodeProject::saveProjectFile(){
-	std::string fileName = projectDir + projectName + ".xcodeproj/project.pbxproj";
+	of::filesystem::path fileName = projectDir / (projectName + ".xcodeproj/project.pbxproj");
 	
 	// JSON Block - Multiplatform
 	string contents = ofBufferFromFile(fileName).getText();
 	json j = json::parse(contents);
 
 	for (auto & c : commands) {
-		//cout << c << endl;
+//		cout << c << endl;
 		vector<string> cols = ofSplitString(c, " ");
 		string thispath = cols[1];
 		ofStringReplace(thispath, ":", "/");
diff --git a/ofxProjectGenerator/src/utils/Utils.cpp b/ofxProjectGenerator/src/utils/Utils.cpp
index 0bf60876..0a60bc4b 100644
--- a/ofxProjectGenerator/src/utils/Utils.cpp
+++ b/ofxProjectGenerator/src/utils/Utils.cpp
@@ -5,33 +5,26 @@
  *      Author: arturo
  */
 
-#include "Utils.h"
+#include "ofUtils.h"
 
-#include <algorithm>
-#include <Poco/DirectoryIterator.h>
-#include <Poco/DateTimeFormatter.h>
-#include <Poco/LocalDateTime.h>
-#include <algorithm>
-#include <iostream>
-#include <fstream>
-#include <string>
+#include "Utils.h"
 
 #include "qtcreatorproject.h"
 #include "CBWinProject.h"
 #include "xcodeProject.h"
 #include "visualStudioProject.h"
 #include "androidStudioProject.h"
+#include <algorithm>
+#include <iostream>
+#include <fstream>
+#include <string>
 
-#include "Poco/String.h"
-
+// FIXME: this can be replaced by this one https://github.com/neosmart/uuidxx
 #include "Poco/HMACEngine.h"
 #include "Poco/MD5Engine.h"
 using Poco::DigestEngine;
 using Poco::HMACEngine;
 using Poco::MD5Engine;
-using namespace std;
-
-
 
 #ifdef TARGET_WIN32
 #include <direct.h>
@@ -44,10 +37,7 @@ using namespace std;
 #include <limits.h>		/* PATH_MAX */
 #endif
 
-
-using namespace Poco;
-
-#include "ofUtils.h"
+using std::unique_ptr;
 
 std::string generateUUID(std::string input){
 
@@ -103,7 +93,8 @@ std::string LoadFileAsString(const std::string & fn)
     return oss.str();
 }
 
-void findandreplaceInTexfile (std::string fileName, std::string tFind, std::string tReplace ){
+void findandreplaceInTexfile (const of::filesystem::path & fileName, std::string tFind, std::string tReplace ){
+//void findandreplaceInTexfile (std::string fileName, std::string tFind, std::string tReplace ){
    if( ofFile::doesFileExist(fileName) ){
 	
 	    std::ifstream t(ofToDataPath(fileName).c_str());
@@ -161,7 +152,7 @@ pugi::xml_node appendValue(pugi::xml_document & doc, std::string tag, std::strin
         pugi::xpath_node node = doc.select_node(xpathExpression);
         if(std::string(node.node().attribute(attribute.c_str()).value()).size() > 0){ // for some reason we get nulls here?
             // ...delete the existing node
-            cout << "DELETING: " << node.node().name() << ": " << " " << node.node().attribute(attribute.c_str()).value() << endl;
+            std::cout << "DELETING: " << node.node().name() << ": " << " " << node.node().attribute(attribute.c_str()).value() << std::endl;
             node.node().parent().remove_child(node.node());
         }
     }
@@ -184,11 +175,8 @@ pugi::xml_node appendValue(pugi::xml_document & doc, std::string tag, std::strin
 
 // todo -- this doesn't use ofToDataPath -- so it's broken a bit.  can we fix?
 void getFilesRecursively(const of::filesystem::path & path, std::vector < std::string > & fileNames){
-
+//	cout << "---- getFilesRecursively :: " << path << endl;
     ofDirectory dir;
-
-    //ofLogVerbose() << "in getFilesRecursively "<< path << endl;
-
     dir.listDir(path);
     for (int i = 0; i < dir.size(); i++){
         ofFile temp(dir.getFile(i));
@@ -196,15 +184,16 @@ void getFilesRecursively(const of::filesystem::path & path, std::vector < std::s
         if (ofIsStringInString(dir.getName(i),".framework")) continue; // ignore frameworks
         
         if (temp.isFile()){
+//			cout << dir.getPath(i) << endl;
             fileNames.push_back(dir.getPath(i));
         } else if (temp.isDirectory()){
+//			cout << "this is directory : " << dir.getPath(i) << endl;
             getFilesRecursively(dir.getPath(i), fileNames);
         }
     }
-    //folderNames.push_back(path);
-
 }
 
+
 static std::vector <std::string> platforms;
 bool isFolderNotCurrentPlatform(std::string folderName, std::string platform){
 	if( platforms.size() == 0 ){
@@ -240,10 +229,10 @@ void splitFromFirst(std::string toSplit, std::string deliminator, std::string &
 }
 
 
-void getFoldersRecursively(const string & path, std::vector < std::string > & folderNames, std::string platform){
+void getFoldersRecursively(const of::filesystem::path & path, std::vector < std::string > & folderNames, std::string platform){
     ofDirectory dir;
     
-    if (!ofIsStringInString(path, ".framework")){
+    if (!ofIsStringInString(path.string(), ".framework")){
         dir.listDir(path);
         for (int i = 0; i < dir.size(); i++){
             ofFile temp(dir.getFile(i));
@@ -251,12 +240,13 @@ void getFoldersRecursively(const string & path, std::vector < std::string > & fo
                 getFoldersRecursively(dir.getPath(i), folderNames, platform);
             }
         }
-        folderNames.push_back(path);
+		// FIXME: convert folderNames to path
+        folderNames.push_back(path.string());
     }
 }
 
 
-void getFrameworksRecursively( const std::string & path, std::vector < std::string > & frameworks, std::string platform){
+void getFrameworksRecursively(const of::filesystem::path & path, std::vector < std::string > & frameworks, std::string platform){
     
     
     ofDirectory dir;
@@ -284,7 +274,7 @@ void getFrameworksRecursively( const std::string & path, std::vector < std::stri
 
 
 
-void getPropsRecursively(const std::string & path, std::vector < std::string > & props, const std::string & platform) {
+void getPropsRecursively(const of::filesystem::path & path, std::vector < std::string > & props, const std::string & platform) {
 
     if(!ofDirectory::doesDirectoryExist(path)) return; //check for dir existing before listing to prevent lots of "source directory does not exist" errors printed on console
     ofDirectory dir;
@@ -309,7 +299,7 @@ void getPropsRecursively(const std::string & path, std::vector < std::string > &
 }
 
 
-void getDllsRecursively(const std::string & path, std::vector < std::string > & dlls, std::string platform) {
+void getDllsRecursively(const of::filesystem::path & path, std::vector < std::string > & dlls, std::string platform) {
 	ofDirectory dir;
 	dir.listDir(path);
 
@@ -332,7 +322,7 @@ void getDllsRecursively(const std::string & path, std::vector < std::string > &
 
 
 
-void getLibsRecursively(const std::string & path, std::vector < std::string > & libFiles, std::vector < LibraryBinary > & libLibs, std::string platform, std::string arch, std::string target){
+void getLibsRecursively(const of::filesystem::path & path, std::vector < std::string > & libFiles, std::vector < LibraryBinary > & libLibs, std::string platform, std::string arch, std::string target){
     ofDirectory dir;
     dir.listDir(path);
 
@@ -437,55 +427,16 @@ std::string getAddonsRoot(){
 }
 
 void setOFRoot(std::string path){
-	cout << "setOFRoot : " << path << endl;
 	OFRoot = path;
 }
 
-std::string getOFRelPath(std::string from){
-	from = ofFilePath::removeTrailingSlash(from);
-    Poco::Path base(true);
-    base.parse(from);
-
-    Poco::Path path;
-    path.parse( getOFRoot() );
-    path.makeAbsolute();
-
-
-	std::string relPath;
-	if (path.toString() == base.toString()){
-		// do something.
-	}
-
-	int maxx = std::max(base.depth(), path.depth());
-	for (int i = 0; i <= maxx; i++){
-
-		bool bRunOut = false;
-		bool bChanged = false;
-		if (i <= base.depth() && i <= path.depth()){
-			if (base.directory(i) == path.directory(i)){
-
-			} else {
-				bChanged = true;
-			}
-		} else {
-			bRunOut = true;
-		}
-
-
-		if (bRunOut == true || bChanged == true){
-            for (int j = i; j <= base.depth(); j++){
-				relPath += "../";
-			}
-			for (int j = i; j <= path.depth(); j++){
-				relPath += path.directory(j) + "/";
-			}
-			break;
-		}
-	}
-
-	ofLogVerbose() << "returning path " << relPath << std::endl;
+// FIXME: - in the future this can be the getOFRelPath
+of::filesystem::path getOFRelPathFS(const of::filesystem::path & from) {
+	return of::filesystem::relative(getOFRoot(), from);
+}
 
-    return relPath;
+std::string getOFRelPath(const std::string & from) {
+	return getOFRelPathFS(from).string();
 }
 
 bool checkConfigExists(){
diff --git a/ofxProjectGenerator/src/utils/Utils.h b/ofxProjectGenerator/src/utils/Utils.h
index fcc45e55..42f31047 100644
--- a/ofxProjectGenerator/src/utils/Utils.h
+++ b/ofxProjectGenerator/src/utils/Utils.h
@@ -25,20 +25,19 @@ std::string getOFRoot();
 std::string getAddonsRoot();
 void setOFRoot(std::string path);
 void findandreplace( std::string& tInput, std::string tFind, std::string tReplace );
-void findandreplaceInTexfile (std::string fileName, std::string tFind, std::string tReplace );
-
+void findandreplaceInTexfile (const of::filesystem::path & fileName, std::string tFind, std::string tReplace );
 
 bool doesTagAndAttributeExist(pugi::xml_document & doc, std::string tag, std::string attribute, std::string newValue);
 pugi::xml_node appendValue(pugi::xml_document & doc, std::string tag, std::string attribute, std::string newValue, bool addMultiple = false);
 
 
 
-void getFoldersRecursively(const std::string & path, std::vector < std::string > & folderNames, std::string platform);
+void getFoldersRecursively(const of::filesystem::path & path, std::vector < std::string > & folderNames, std::string platform);
 void getFilesRecursively(const of::filesystem::path & path, std::vector < std::string > & fileNames);
-void getLibsRecursively(const std::string & path, std::vector < std::string > & libFiles, std::vector < LibraryBinary > & libLibs, std::string platform = "", std::string arch = "", std::string target = "");
-void getFrameworksRecursively( const std::string & path, std::vector < std::string > & frameworks,  std::string platform = "" );
-void getPropsRecursively(const std::string & path, std::vector < std::string > & props, const std::string & platform);
-void getDllsRecursively(const std::string & path, std::vector < std::string > & dlls, std::string platform);
+void getLibsRecursively(const of::filesystem::path & path, std::vector < std::string > & libFiles, std::vector < LibraryBinary > & libLibs, std::string platform = "", std::string arch = "", std::string target = "");
+void getFrameworksRecursively(const of::filesystem::path & path, std::vector < std::string > & frameworks,  std::string platform = "" );
+void getPropsRecursively(const of::filesystem::path & path, std::vector < std::string > & props, const std::string & platform);
+void getDllsRecursively(const of::filesystem::path & path, std::vector < std::string > & dlls, std::string platform);
 
 
 void splitFromLast(std::string toSplit, std::string deliminator, std::string & first, std::string & second);
@@ -47,7 +46,8 @@ void splitFromFirst(std::string toSplit, std::string deliminator, std::string &
 void fixSlashOrder(std::string & toFix);
 std::string unsplitString (std::vector < std::string > strings, std::string deliminator );
 
-std::string getOFRelPath(std::string from);
+std::string getOFRelPath(const std::string & from);
+of::filesystem::path getOFRelPathFS(const of::filesystem::path & from);
 
 bool checkConfigExists();
 bool askOFRoot();