diff --git a/Makefile b/Makefile
index 59b937a..cbdcc77 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,66 @@
-.PHONY : all librtaputil clean purge help install install-librtaputil install-loc-bts install-loc-mobile uninstall uninstall-librtaputil uninstall-loc-bts uninstall-loc-mobile
+.PHONY : all libowlps owlps-positioning clean purge help install install-libowlps install-infrastructure-centred install-mobile-centred uninstall uninstall-libowlps uninstall-infrastructure-centred uninstall-mobile-centred
 
 ## Compilation ##
 
-all : librtaputil loc-bts loc-mobile
+all : libowlps owlps-positioning infrastructure-centred mobile-centred
 
-librtaputil :
-	@make -C librtaputil
+libowlps :
+	@make -C libowlps
 
-loc-bts : librtaputil
-	@make -C loc-bts
+owlps-positioning :
+	@make -C owlps-positioning
 
-loc-mobile : librtaputil
-	@make -C loc-mobile
+infrastructure-centred : libowlps
+	@make -C infrastructure-centred
+
+mobile-centred : libowlps
+	@make -C mobile-centred
 
 ## Installation ##
 
-install : install-librtaputil install-loc-bts install-loc-mobile
+install : install-libowlps install-owlps-positioning install-infrastructure-centred install-mobile-centred
 
-install-librtaputil :
-	@make -C librtaputil install
+install-libowlps :
+	@make -C libowlps install
 
-install-loc-bts : install-librtaputil
-	@make -C loc-bts install
+install-owlps-positioning :
+	@make -C owlps-positioning install
 
-install-loc-mobile : install-librtaputil
-	@make -C loc-mobile install
+install-infrastructure-centred : install-libowlps
+	@make -C infrastructure-centred install
+
+install-mobile-centred : install-libowlps
+	@make -C mobile-centred install
 
 ## Désinstallation ##
 
-uninstall : uninstall-librtaputil uninstall-loc-bts uninstall-loc-mobile
+uninstall : uninstall-libowlps uninstall-infrastructure-centred uninstall-mobile-centred
 
-uninstall-librtaputil : uninstall-loc-bts uninstall-loc-mobile
-	@make -C librtaputil uninstall
+uninstall-libowlps : uninstall-infrastructure-centred uninstall-mobile-centred
+	@make -C libowlps uninstall
 
-uninstall-loc-bts :
-	@make -C loc-bts uninstall
+uninstall-owlps-positioning :
+	@make -C owlps-positioning uninstall
 
-uninstall-loc-mobile :
-	@make -C loc-mobile uninstall
+uninstall-infrastructure-centred :
+	@make -C infrastructure-centred uninstall
+
+uninstall-mobile-centred :
+	@make -C mobile-centred uninstall
 
 ## Nettoyage ##
 
 clean :
-	@make -C librtaputil clean
-	@make -C loc-bts clean
-	@make -C loc-mobile clean
+	@make -C libowlps clean
+	@make -C owlps-positioning clean
+	@make -C infrastructure-centred clean
+	@make -C mobile-centred clean
 
 purge :
-	@make -C librtaputil purge
-	@make -C loc-bts purge
-	@make -C loc-mobile purge
+	@make -C libowlps purge
+	@make -C owlps-positioning purge
+	@make -C infrastructure-centred purge
+	@make -C mobile-centred purge
 
 ## Aide ##
 
diff --git a/infrastructure-centred/Makefile b/infrastructure-centred/Makefile
new file mode 100644
index 0000000..ccc8dbb
--- /dev/null
+++ b/infrastructure-centred/Makefile
@@ -0,0 +1,74 @@
+.PHONY : all owlps-aggregator owlps-listener owlps-client clean purge help install install-owlps-aggregator install-owlps-listener install-owlps-client uninstall uninstall-owlps-aggregator uninstall-owlps-listener uninstall-owlps-client
+
+## Compilation ##
+
+all : owlps-aggregator owlps-listener owlps-client
+
+owlps-aggregator :
+	@make -C owlps-aggregator
+
+owlps-listener :
+	@make -C owlps-listener
+
+owlps-client :
+	@make -C owlps-client
+
+## Installation ##
+
+install : install-owlps-aggregator install-owlps-listener install-owlps-client
+
+install-owlps-aggregator :
+	@make -C owlps-aggregator install
+
+install-owlps-listener :
+	@make -C owlps-listener install
+
+install-owlps-client :
+	@make -C owlps-client install
+
+## Désinstallation ##
+
+uninstall : uninstall-owlps-aggregator uninstall-owlps-listener uninstall-owlps-client
+
+uninstall-owlps-aggregator :
+	@make -C owlps-aggregator uninstall
+
+uninstall-owlps-listener :
+	@make -C owlps-listener uninstall
+
+uninstall-owlps-client :
+	@make -C owlps-client uninstall
+
+## Nettoyage ##
+
+clean :
+	@make -C owlps-aggregator clean
+	@make -C owlps-listener clean
+	@make -C owlps-client clean
+
+purge :
+	@make -C owlps-aggregator purge
+	@make -C owlps-listener purge
+	@make -C owlps-client purge
+
+## Aide ##
+
+help :
+	@echo "Bibliothèques nécessaires à la compilation :\n\
+		libpcap0.8-dev\n\
+		libowlps1.0 (fournie)\n\
+	\n\
+	Cibles possibles :\n\
+		all (cible par défaut) : Compile tous les modules.\n\
+		<module> : Compile uniquement le module <module> (et ses dépendances).\n\
+	\n\
+		install : Installe tous les modules.\n\
+		install-<module> : Installe uniquement le module <module> (et ses dépendances).\n\
+	\n\
+		uninstall : Désinstalle tous les modules.\n\
+		uninstall-<module> : Désinstalle uniquement le module <module> (et ses dépendances).\n\
+	\n\
+		clean : Supprime les fichiers temporaires.\n\
+		purge : Supprime le résultat de la compilation.\n\
+	\n\
+	Note : l'installation se fait dans l'arborescence /usr/local. Modifiez la variable PREFIX de chaque Makefile pour changer ce comportement."
diff --git a/infrastructure-centred/TODO b/infrastructure-centred/TODO
new file mode 100644
index 0000000..e2d2f38
--- /dev/null
+++ b/infrastructure-centred/TODO
@@ -0,0 +1,11 @@
+* Un peu partout : fixer la taille des données échangées (float = 4 octets, etc.).
+
+* client :
+   - Vérifier que la direction est bien une des quatre possibles.
+	 - Éventuellement, permettre l'utilisation d'une chaîne de caractères pour la direction.
+	 - Faire une vraie gestion des arguments, enlever ce argv++ fort laid.
+	 - Régler avec des arguments plutôt qu'en statique le nombre de paquets envoyés et le délai entre chaque envoi.
+
+* apd : permettre d'utiliser un nom d'hôte putôt qu'une IP pour le serveur d'agrégation.
+
+* Permettre de choisir soi-même le port des communications, aussi bien sur le mobile (demande de localisation), que sur les AP et le serveur d'agrégation. Pour l'instant, les ports sont gérés grâce aux constantes AGGREGATE_DEFAULT_PORT et LOC_REQUEST_DEFAULT_PORT.
diff --git a/loc-bts/rtapaggregate/Makefile b/infrastructure-centred/owlps-aggregator/Makefile
similarity index 92%
rename from loc-bts/rtapaggregate/Makefile
rename to infrastructure-centred/owlps-aggregator/Makefile
index fd57eb8..63bbd19 100644
--- a/loc-bts/rtapaggregate/Makefile
+++ b/infrastructure-centred/owlps-aggregator/Makefile
@@ -13,15 +13,15 @@ RM=rm -fv
 CP=cp -v
 
 # Cible
-TARGET=rtapaggregated
-HEADER=rtapaggregate.h
+TARGET=owlps-aggregatord
+HEADER=owlps-aggregator.h
 
 # Flags
 CFLAGS=-O2 -W -Wall -Wstrict-prototypes -O -I.
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
-LIBS=-lpthread ../../librtaputil/librtaputil.so.1.0
+LIBS=-lpthread ../../libowlps/libowlps.so.1.0
 
 
 ## Cibles de compilation standard ##
@@ -62,7 +62,7 @@ purge : clean
 
 help :
 	@echo "Bibliothèques nécessaires à la compilation :\n\
-		librtaputil1.0 (fournie)\n\
+		libowlps1.0 (fournie)\n\
 	\n\
 	Cibles possibles :\n\
 		$(TARGET) (cible par défaut) : Compile le programme $(TARGET).\n\
diff --git a/loc-bts/rtapaggregate/rtapaggregate.h b/infrastructure-centred/owlps-aggregator/owlps-aggregator.h
similarity index 98%
rename from loc-bts/rtapaggregate/rtapaggregate.h
rename to infrastructure-centred/owlps-aggregator/owlps-aggregator.h
index 0f3918a..a83c175 100644
--- a/loc-bts/rtapaggregate/rtapaggregate.h
+++ b/infrastructure-centred/owlps-aggregator/owlps-aggregator.h
@@ -6,7 +6,7 @@
 #define _RTAPAGGREGATE_H
 
 
-#include "../../librtaputil/rtaputil.h"
+#include "../../libowlps/owlps.h"
 
 
 //#define TIMESTAMP // Décommenter pour afficher le timestamp à chaque ligne du fichier de sortie.
diff --git a/loc-bts/rtapaggregate/rtapaggregated.c b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
similarity index 99%
rename from loc-bts/rtapaggregate/rtapaggregated.c
rename to infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
index a3e19ac..8e24071 100644
--- a/loc-bts/rtapaggregate/rtapaggregated.c
+++ b/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c
@@ -3,7 +3,7 @@
  */
 
 
-#include "rtapaggregate.h"
+#include "owlps-aggregator.h"
 
 #define DEBUG
 
diff --git a/loc-bts/client/Makefile b/infrastructure-centred/owlps-client/Makefile
similarity index 95%
rename from loc-bts/client/Makefile
rename to infrastructure-centred/owlps-client/Makefile
index 8a1ab35..34782ce 100644
--- a/loc-bts/client/Makefile
+++ b/infrastructure-centred/owlps-client/Makefile
@@ -13,7 +13,7 @@ RM=rm -fv
 CP=cp -v
 
 # Cible
-TARGET=locclient
+TARGET=owlps-client
 HEADER=
 
 # Flags
@@ -21,7 +21,7 @@ CFLAGS=-O2 -W -Wall -Wstrict-prototypes -O -I.
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
-LIBS=-lrtaputil
+LIBS=../../libowlps/libowlps.so.1.0
 STATIC_LIBS=-liw -lm
 
 
@@ -71,7 +71,7 @@ purge : clean
 
 help :
 	@echo "Bibliothèques nécessaires à la compilation :\n\
-		librtaputil1.0 (fournie)\n\
+		libowlps1.0 (fournie)\n\
 	\n\
 	Cibles possibles :\n\
 		$(TARGET) (cible par défaut) : Compile le programme $(TARGET).\n\
diff --git a/loc-bts/client/locclient.c b/infrastructure-centred/owlps-client/owlps-client.c
similarity index 97%
rename from loc-bts/client/locclient.c
rename to infrastructure-centred/owlps-client/owlps-client.c
index 6991484..986e6b8 100644
--- a/loc-bts/client/locclient.c
+++ b/infrastructure-centred/owlps-client/owlps-client.c
@@ -3,7 +3,7 @@
  */
 
 
-#include "../../librtaputil/rtaputil.h"
+#include "../../libowlps/owlps.h"
 
 #define DEBUG
 
@@ -21,8 +21,8 @@
 #define NBPKT_NORMAL 10 // Nombre de paquets envoyés dans le cas d'une demande de localisation
 
 /* Délai entre chaque paquet envoyé */
-#define DELAY_CALIB 50000 // Délai entre chaque émission de paquet lors de la calibration (en ms)
-#define DELAY_NORMAL 25000 // Délai entre chaque émission de paquet dans le cas d'une demande de localisation (en ms)
+#define DELAY_CALIB 50000 // Délai entre chaque émission de paquet lors de la calibration (en microsecondes)
+#define DELAY_NORMAL 25000 // Délai entre chaque émission de paquet dans le cas d'une demande de localisation (en microsecondes)
 
 
 
diff --git a/loc-bts/ap/Makefile b/infrastructure-centred/owlps-listener/Makefile
similarity index 92%
rename from loc-bts/ap/Makefile
rename to infrastructure-centred/owlps-listener/Makefile
index 87ab141..bec5577 100644
--- a/loc-bts/ap/Makefile
+++ b/infrastructure-centred/owlps-listener/Makefile
@@ -13,15 +13,15 @@ RM=rm -fv
 CP=cp -v
 
 # Cible
-TARGET=apd
-HEADER=ap.h
+TARGET=owlps-listenerd
+HEADER=owlps-listener.h
 
 # Flags
 CFLAGS=-O2 -W -Wall -Wstrict-prototypes -O -I.
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
-LIBS=-lm -lpcap -lpthread ../../librtaputil/librtaputil.so.1.0
+LIBS=-lm -lpcap -lpthread ../../libowlps/libowlps.so.1.0
 
 
 ## Cibles de compilation standard ##
@@ -63,7 +63,7 @@ purge : clean
 help :
 	@echo "Bibliothèques nécessaires à la compilation :\n\
 		libpcap0.8-dev\n\
-		librtaputil1.0 (fournie)\n\
+		libowlps1.0 (fournie)\n\
 	\n\
 	Cibles possibles :\n\
 		$(TARGET) (cible par défaut) : Compile le programme $(TARGET).\n\
diff --git a/loc-bts/ap/ap.h b/infrastructure-centred/owlps-listener/owlps-listener.h
similarity index 96%
rename from loc-bts/ap/ap.h
rename to infrastructure-centred/owlps-listener/owlps-listener.h
index e8ec883..157be35 100644
--- a/loc-bts/ap/ap.h
+++ b/infrastructure-centred/owlps-listener/owlps-listener.h
@@ -6,7 +6,7 @@
 #define _AP_H
 
 
-#include "../../librtaputil/rtaputil.h"
+#include "../../libowlps/owlps.h"
 #include <pcap.h>
 
 // Pour la fonction get_mac_addr() :
diff --git a/loc-bts/ap/apd.c b/infrastructure-centred/owlps-listener/owlps-listenerd.c
similarity index 99%
rename from loc-bts/ap/apd.c
rename to infrastructure-centred/owlps-listener/owlps-listenerd.c
index 2d9f545..245262b 100644
--- a/loc-bts/ap/apd.c
+++ b/infrastructure-centred/owlps-listener/owlps-listenerd.c
@@ -3,7 +3,7 @@
  */
 
 
-#include "ap.h"
+#include "owlps-listener.h"
 
 #define DEBUG
 
diff --git a/librtaputil/Makefile b/libowlps/Makefile
similarity index 98%
rename from librtaputil/Makefile
rename to libowlps/Makefile
index 07616c9..55fde7b 100644
--- a/librtaputil/Makefile
+++ b/libowlps/Makefile
@@ -17,14 +17,14 @@ CP=cp -v
 SYMLINK=ln -svf
 
 # Variables générales
-LIB_CIBLE=librtaputil
+LIB_CIBLE=libowlps
 VERSION=1.0
 
 # Cibles à construire
 STATIC=$(LIB_CIBLE).a
 DYNAMIC=$(LIB_CIBLE).so.$(VERSION)
 #PROGS=
-HEADER=rtaputil.h
+HEADER=owlps.h
 #HEADERS=
 
 # Composition de la bibliothèque
diff --git a/librtaputil/librtaputil.c b/libowlps/libowlps.c
similarity index 99%
rename from librtaputil/librtaputil.c
rename to libowlps/libowlps.c
index b87c4a2..c920250 100644
--- a/librtaputil/librtaputil.c
+++ b/libowlps/libowlps.c
@@ -3,7 +3,7 @@
  */
 
 
-#include "rtaputil.h"
+#include "owlps.h"
 
 
 #define DEBUG
diff --git a/librtaputil/rtaputil.h b/libowlps/owlps.h
similarity index 100%
rename from librtaputil/rtaputil.h
rename to libowlps/owlps.h
diff --git a/loc-bts/Makefile b/loc-bts/Makefile
deleted file mode 100644
index a4f039d..0000000
--- a/loc-bts/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-.PHONY : all rtapaggregate ap client clean purge help install install-rtapaggregate install-ap install-client uninstall uninstall-rtapaggregate uninstall-ap uninstall-client
-
-## Compilation ##
-
-all : rtapaggregate ap client
-
-rtapaggregate :
-	@make -C rtapaggregate
-
-ap :
-	@make -C ap
-
-client :
-	@make -C client
-
-## Installation ##
-
-install : install-rtapaggregate install-ap install-client
-
-install-rtapaggregate :
-	@make -C rtapaggregate install
-
-install-ap :
-	@make -C ap install
-
-install-client :
-	@make -C client install
-
-## Désinstallation ##
-
-uninstall : uninstall-rtapaggregate uninstall-ap uninstall-client
-
-uninstall-rtapaggregate :
-	@make -C rtapaggregate uninstall
-
-uninstall-ap :
-	@make -C ap uninstall
-
-uninstall-client :
-	@make -C client uninstall
-
-## Nettoyage ##
-
-clean :
-	@make -C rtapaggregate clean
-	@make -C ap clean
-	@make -C client clean
-
-purge :
-	@make -C rtapaggregate purge
-	@make -C ap purge
-	@make -C client purge
-
-## Aide ##
-
-help :
-	@echo "Bibliothèques nécessaires à la compilation :\n\
-		libpcap0.8-dev\n\
-		librtaputil1.0 (fournie)\n\
-	\n\
-	Cibles possibles :\n\
-		all (cible par défaut) : Compile tous les modules.\n\
-		<module> : Compile uniquement le module <module> (et ses dépendances).\n\
-	\n\
-		install : Installe tous les modules.\n\
-		install-<module> : Installe uniquement le module <module> (et ses dépendances).\n\
-	\n\
-		uninstall : Désinstalle tous les modules.\n\
-		uninstall-<module> : Désinstalle uniquement le module <module> (et ses dépendances).\n\
-	\n\
-		clean : Supprime les fichiers temporaires.\n\
-		purge : Supprime le résultat de la compilation.\n\
-	\n\
-	Note : l'installation se fait dans l'arborescence /usr/local. Modifiez la variable PREFIX de chaque Makefile pour changer ce comportement."
diff --git a/loc-bts/TODO b/loc-bts/TODO
deleted file mode 100644
index ed85e16..0000000
--- a/loc-bts/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-* apd : permettre d'utiliser un nom d'hôte putôt qu'une IP pour le serveur d'agrégation.
-
-* Permettre de choisir soi-même le port des communications, aussi bien sur le mobile (demande de localisation), que sur les AP et le serveur d'agrégation. Pour l'instant, les ports sont gérés grâce aux constantes AGGREGATE_DEFAULT_PORT et LOC_REQUEST_DEFAULT_PORT.
diff --git a/loc-mobile/Makefile b/mobile-centred/Makefile
similarity index 100%
rename from loc-mobile/Makefile
rename to mobile-centred/Makefile
diff --git a/loc-mobile/TODO b/mobile-centred/TODO
similarity index 100%
rename from loc-mobile/TODO
rename to mobile-centred/TODO
diff --git a/loc-mobile/librtapscanmob/Makefile b/mobile-centred/librtapscanmob/Makefile
similarity index 97%
rename from loc-mobile/librtapscanmob/Makefile
rename to mobile-centred/librtapscanmob/Makefile
index 4a0e7a2..bdd1591 100644
--- a/loc-mobile/librtapscanmob/Makefile
+++ b/mobile-centred/librtapscanmob/Makefile
@@ -34,7 +34,8 @@ CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
-LIBS=-lm -lpcap ../../librtaputil/librtaputil.so.1.0
+LIBS=-lm -lpcap
+
 #STRIPFLAGS= -Wl,-s
 
 
@@ -112,7 +113,7 @@ purge : clean
 help :
 	@echo -e "Bibliothèques nécessaires à la compilation :\n\
 		libpcap0.8-dev\n\
-		librtaputil1.0 (fournie)\n\
+		libowlps1.0 (fournie)\n\
 	\n\
 	Cibles possibles :\n\
 		all (cible par défaut) : Compile la bibliothèque partagée et statique.\n\
diff --git a/loc-mobile/librtapscanmob/librtapscanmob.c b/mobile-centred/librtapscanmob/librtapscanmob.c
similarity index 100%
rename from loc-mobile/librtapscanmob/librtapscanmob.c
rename to mobile-centred/librtapscanmob/librtapscanmob.c
diff --git a/loc-mobile/librtapscanmob/rtapscanmob.h b/mobile-centred/librtapscanmob/rtapscanmob.h
similarity index 98%
rename from loc-mobile/librtapscanmob/rtapscanmob.h
rename to mobile-centred/librtapscanmob/rtapscanmob.h
index 75b40c5..646f74d 100644
--- a/loc-mobile/librtapscanmob/rtapscanmob.h
+++ b/mobile-centred/librtapscanmob/rtapscanmob.h
@@ -9,7 +9,7 @@
 
 #include <pcap.h>
 
-#include "../../librtaputil/rtaputil.h"
+#include "../../libowlps/owlps.h"
 
 
 
diff --git a/loc-mobile/mobile/Makefile b/mobile-centred/mobile/Makefile
similarity index 92%
rename from loc-mobile/mobile/Makefile
rename to mobile-centred/mobile/Makefile
index 95125fd..d5d5853 100644
--- a/loc-mobile/mobile/Makefile
+++ b/mobile-centred/mobile/Makefile
@@ -21,8 +21,7 @@ CFLAGS=-O2 -W -Wall -Wstrict-prototypes -O -I.
 DEPFLAGS=-MMD
 XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
 PICFLAG=-fPIC
-#LIBS=../../librtaputil/librtaputil.so.1.0 ../librtapscanmob/librtapscanmob.so.1.0
-LIBS=../librtapscanmob/librtapscanmob.so.1.0
+LIBS=../../libowlps/libowlps.so.1.0 ../librtapscanmob/librtapscanmob.so.1.0
 
 
 ## Cibles de compilation standard ##
diff --git a/loc-mobile/mobile/mobile.c b/mobile-centred/mobile/mobile.c
similarity index 100%
rename from loc-mobile/mobile/mobile.c
rename to mobile-centred/mobile/mobile.c
diff --git a/GuiNuMo-server/Makefile b/owlps-positioning/Makefile
similarity index 100%
rename from GuiNuMo-server/Makefile
rename to owlps-positioning/Makefile
diff --git a/GuiNuMo-server/TODO b/owlps-positioning/TODO
similarity index 100%
rename from GuiNuMo-server/TODO
rename to owlps-positioning/TODO
diff --git a/GuiNuMo-server/accesspoint.cc b/owlps-positioning/accesspoint.cc
similarity index 100%
rename from GuiNuMo-server/accesspoint.cc
rename to owlps-positioning/accesspoint.cc
diff --git a/GuiNuMo-server/accesspoint.hh b/owlps-positioning/accesspoint.hh
similarity index 100%
rename from GuiNuMo-server/accesspoint.hh
rename to owlps-positioning/accesspoint.hh
diff --git a/GuiNuMo-server/area.cc b/owlps-positioning/area.cc
similarity index 100%
rename from GuiNuMo-server/area.cc
rename to owlps-positioning/area.cc
diff --git a/GuiNuMo-server/area.hh b/owlps-positioning/area.hh
similarity index 100%
rename from GuiNuMo-server/area.hh
rename to owlps-positioning/area.hh
diff --git a/GuiNuMo-server/cfg/access_points.cfg b/owlps-positioning/cfg/access_points.cfg
similarity index 100%
rename from GuiNuMo-server/cfg/access_points.cfg
rename to owlps-positioning/cfg/access_points.cfg
diff --git a/GuiNuMo-server/cfg/accesspoints.cfg b/owlps-positioning/cfg/accesspoints.cfg
similarity index 100%
rename from GuiNuMo-server/cfg/accesspoints.cfg
rename to owlps-positioning/cfg/accesspoints.cfg
diff --git a/GuiNuMo-server/cfg/minipc.cfg b/owlps-positioning/cfg/minipc.cfg
similarity index 100%
rename from GuiNuMo-server/cfg/minipc.cfg
rename to owlps-positioning/cfg/minipc.cfg
diff --git a/GuiNuMo-server/cfg/topo.csv b/owlps-positioning/cfg/topo.csv
similarity index 100%
rename from GuiNuMo-server/cfg/topo.csv
rename to owlps-positioning/cfg/topo.csv
diff --git a/GuiNuMo-server/cfg/waypoints.csv b/owlps-positioning/cfg/waypoints.csv
similarity index 100%
rename from GuiNuMo-server/cfg/waypoints.csv
rename to owlps-positioning/cfg/waypoints.csv
diff --git a/GuiNuMo-server/clientinfo.cc b/owlps-positioning/clientinfo.cc
similarity index 100%
rename from GuiNuMo-server/clientinfo.cc
rename to owlps-positioning/clientinfo.cc
diff --git a/GuiNuMo-server/clientinfo.hh b/owlps-positioning/clientinfo.hh
similarity index 100%
rename from GuiNuMo-server/clientinfo.hh
rename to owlps-positioning/clientinfo.hh
diff --git a/GuiNuMo-server/csv/README b/owlps-positioning/csv/README
similarity index 100%
rename from GuiNuMo-server/csv/README
rename to owlps-positioning/csv/README
diff --git a/GuiNuMo-server/guinumo.cc b/owlps-positioning/guinumo.cc
similarity index 100%
rename from GuiNuMo-server/guinumo.cc
rename to owlps-positioning/guinumo.cc
diff --git a/GuiNuMo-server/guinumo.hh b/owlps-positioning/guinumo.hh
similarity index 100%
rename from GuiNuMo-server/guinumo.hh
rename to owlps-positioning/guinumo.hh
diff --git a/GuiNuMo-server/log/README b/owlps-positioning/log/README
similarity index 100%
rename from GuiNuMo-server/log/README
rename to owlps-positioning/log/README
diff --git a/GuiNuMo-server/measurement.cc b/owlps-positioning/measurement.cc
similarity index 100%
rename from GuiNuMo-server/measurement.cc
rename to owlps-positioning/measurement.cc
diff --git a/GuiNuMo-server/measurement.hh b/owlps-positioning/measurement.hh
similarity index 100%
rename from GuiNuMo-server/measurement.hh
rename to owlps-positioning/measurement.hh
diff --git a/GuiNuMo-server/point.cc b/owlps-positioning/point.cc
similarity index 100%
rename from GuiNuMo-server/point.cc
rename to owlps-positioning/point.cc
diff --git a/GuiNuMo-server/point.hh b/owlps-positioning/point.hh
similarity index 100%
rename from GuiNuMo-server/point.hh
rename to owlps-positioning/point.hh
diff --git a/GuiNuMo-server/referencepoint.cc b/owlps-positioning/referencepoint.cc
similarity index 100%
rename from GuiNuMo-server/referencepoint.cc
rename to owlps-positioning/referencepoint.cc
diff --git a/GuiNuMo-server/referencepoint.hh b/owlps-positioning/referencepoint.hh
similarity index 100%
rename from GuiNuMo-server/referencepoint.hh
rename to owlps-positioning/referencepoint.hh
diff --git a/GuiNuMo-server/server.cc b/owlps-positioning/server.cc
similarity index 99%
rename from GuiNuMo-server/server.cc
rename to owlps-positioning/server.cc
index 4ea1e20..9be8693 100644
--- a/GuiNuMo-server/server.cc
+++ b/owlps-positioning/server.cc
@@ -2521,17 +2521,17 @@ void Server::radar_exp(const string &outfile, const string &testfile)
 		logfile << solution << "\t" << solution.distance(ref_coords) << "\t" ;
 		frbhm_error += solution.distance(ref_coords);
 
-		/* 2-NSS
-		solution = getkWeightedInSs(vm, 2, &ref_coords);
-		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";
+// 		/* 2-NSS */
+// 		solution = getkWeightedInSs(vm, 2, &ref_coords);
+// 		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";
 
-		/* 3-NSS
-		solution = getkWeightedInSs(vm, 3, &ref_coords);
-		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";
+// 		/* 3-NSS */
+// 		solution = getkWeightedInSs(vm, 3, &ref_coords);
+// 		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";
 
-		/* 5-NSS
-		solution = getkWeightedInSs(vm, 5, &ref_coords);
-		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";*/
+// 		/* 5-NSS */
+// 		solution = getkWeightedInSs(vm, 5, &ref_coords);
+// 		logfile << solution << "\t" << solution.distance(ref_coords) << "\t";
 
 		logfile << endl ;
 		vm.clear() ;
diff --git a/GuiNuMo-server/server.hh b/owlps-positioning/server.hh
similarity index 100%
rename from GuiNuMo-server/server.hh
rename to owlps-positioning/server.hh