diff --git a/TODO b/TODO
new file mode 100644
index 0000000..0646670
--- /dev/null
+++ b/TODO
@@ -0,0 +1,69 @@
+* Global
+
+- Fix endianess issues
+   Check carefully the network exchanges to track every non-conversion
+   of endianess.
+- Mark arguments as const in function headers if needed
+   That is done in the owlps-positioning C++ code, but not constantly
+   in C modules.
+- Allow to use hostnames instead of IP addresses.
+
+
+* libowlps
+
+- Prefix all function with "owlps_".
+
+
+* Aggregator
+
+- Use locks to read/write the AP list
+   Currently, several threads can access the list simultaneously, and
+   that's not cool!
+- Allow blank parameters for output options.
+- Fix segfault on SIGINT.
+
+
+* Listener
+
+- read_packet(): use ieee80211_header_size for all implicit packets
+   Currently the size is corrected only for data packets.
+- Fix segfault when rtap_iface is not in monitor mode (?) on Foneras.
+- Merge Makefile and Makefile_atheros?
+   Use autohell?
+- Use positive (USE_CONFUSE) and negative (NO_USE_PTHREAD) options?
+   The default options could be modified, but that's not so important,
+   is it?
+
+
+* libowlps-client
+
+- Rename owlps_create_socket_to_aggregator()
+   This function should be renamed, since it allows (and it is used)
+   to open sockets to other hosts than the aggregator.
+
+
+* Client
+
+- Check the direction
+   The direction provided by the user should be one of the four
+   possible values.
+- Allow to use a string for the direction
+   Could be nice, but probably useless.
+
+
+* Positioning
+
+- Has its own fat TODO file, which I should translate.
+
+
+* writeInDb
+
+- Do something about that
+   ° Merge in owlps-positioning?
+   ° Delete?
+
+
+* mobile-centred
+
+- Has its own TODO file.
+- Maybe we should delete that.
diff --git a/infrastructure-centred/TODO b/infrastructure-centred/TODO
deleted file mode 100644
index aa7cff0..0000000
--- a/infrastructure-centred/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Un peu partout : fixer la taille des données échangées (float = 4 octets, etc.).
-* Vérifier s'il ne manque pas des hton/ntoh (faire des essais).
diff --git a/infrastructure-centred/libowlps-client/TODO b/infrastructure-centred/libowlps-client/TODO
deleted file mode 100644
index 1f82aa2..0000000
--- a/infrastructure-centred/libowlps-client/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Rename owlps_create_socket_to_aggregator, since it allows (and it is
-   used) to open sockets to other hosts than the aggregator.
diff --git a/infrastructure-centred/owlps-aggregator/TODO b/infrastructure-centred/owlps-aggregator/TODO
deleted file mode 100644
index d144a5a..0000000
--- a/infrastructure-centred/owlps-aggregator/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* Poser des verrous pour la lecture/écriture de la liste des AP (plusieurs threads concurrents).
-* Choisir les interfaces en fonction des paramètres spécifiés (permettre des paramètres vides).
diff --git a/infrastructure-centred/owlps-client/TODO b/infrastructure-centred/owlps-client/TODO
deleted file mode 100644
index d5a106a..0000000
--- a/infrastructure-centred/owlps-client/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* 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.
diff --git a/infrastructure-centred/owlps-listener/TODO b/infrastructure-centred/owlps-listener/TODO
deleted file mode 100644
index 04abf3a..0000000
--- a/infrastructure-centred/owlps-listener/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-* read_packet(): use ieee80211_header_size for all implicit packets
-   (currently the size is corrected only for data packets).
-* Fix segfault when rtap_iface is not in monitor mode (?) on Foneras.
-* Fusionner Makefile et Makefile_atheros.
-* Éventuellement remplacer les options positives (USE_PTHREAD) par des
-   options négatives (NO_USE_PTHREAD), en fonction des valeurs par
-   défaut.
-* Permettre d'utiliser un nom d'hôte putôt qu'une IP pour le serveur
-   d'agrégation.