diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/ChangeLog
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
index e5a2d6c..99c2a71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 EXTRA_DIST = MIGRATION libmodbus.spec
-SUBDIRS = src tests
+SUBDIRS = modbus tests
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = modbus.pc
diff --git a/src/Makefile.am b/modbus/Makefile.am
index 60fa7aa..60fa7aa 100644
--- a/src/Makefile.am
+++ b/modbus/Makefile.am
diff --git a/src/modbus.c b/modbus/modbus.c
index 305d1e6..28ff67e 100644
--- a/src/modbus.c
+++ b/modbus/modbus.c
@@ -60,8 +60,8 @@
 #define UINT16_MAX 0xFFFF
 #endif
 
-#include "config.h"
-#include "modbus.h"
+#include <config.h>
+#include <modbus/modbus.h>
 
 #define UNKNOWN_ERROR_MSG "Not defined in modbus specification"
 
diff --git a/src/modbus.h b/modbus/modbus.h
index ea74b9c..ea74b9c 100644
--- a/src/modbus.h
+++ b/modbus/modbus.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 73f37a5..46185e4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,7 @@ noinst_PROGRAMS = \
 	bandwidth-master
 
 common_ldflags = \
-	$(top_builddir)/src/libmodbus.la
+	$(top_builddir)/modbus/libmodbus.la
 
 random_test_slave_SOURCES = random-test-slave.c
 random_test_slave_LDADD = $(common_ldflags)
@@ -33,5 +33,5 @@ bandwidth_slave_many_up_LDADD = $(common_ldflags)
 bandwidth_master_SOURCES = bandwidth-master.c
 bandwidth_master_LDADD = $(common_ldflags)
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src
+INCLUDES = -I$(top_srcdir)
 CLEANFILES = *~
diff --git a/tests/bandwidth-master.c b/tests/bandwidth-master.c
index 6f8a8e4..37d6a92 100644
--- a/tests/bandwidth-master.c
+++ b/tests/bandwidth-master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <sys/time.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 
 /* Tests based on PI-MBUS-300 documentation */
 #define SLAVE     0x11
diff --git a/tests/bandwidth-slave-many-up.c b/tests/bandwidth-slave-many-up.c
index fcfc2e1..eee24e3 100644
--- a/tests/bandwidth-slave-many-up.c
+++ b/tests/bandwidth-slave-many-up.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2009 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2009-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 #include <errno.h>
 #include <signal.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 
 #define SLAVE         0x11
 #define NB_CONNECTION    5
diff --git a/tests/bandwidth-slave-one.c b/tests/bandwidth-slave-one.c
index 1f39944..a626372 100644
--- a/tests/bandwidth-slave-one.c
+++ b/tests/bandwidth-slave-one.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 
 #define SLAVE 0x11
 
diff --git a/tests/random-test-master.c b/tests/random-test-master.c
index e54ef00..cf2557b 100644
--- a/tests/random-test-master.c
+++ b/tests/random-test-master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2001-2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2001-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 
 /* The goal of this program is to check all major functions of
    libmodbus:
diff --git a/tests/random-test-slave.c b/tests/random-test-slave.c
index 086e612..032f324 100644
--- a/tests/random-test-slave.c
+++ b/tests/random-test-slave.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 
 #define SLAVE 0x11
 
diff --git a/tests/unit-test-master.c b/tests/unit-test-master.c
index 309dab9..48852e1 100644
--- a/tests/unit-test-master.c
+++ b/tests/unit-test-master.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 #include "unit-test.h"
 
 /* Tests based on PI-MBUS-300 documentation */
diff --git a/tests/unit-test-slave.c b/tests/unit-test-slave.c
index 6294cf7..ca8ec2f 100644
--- a/tests/unit-test-slave.c
+++ b/tests/unit-test-slave.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2008 Stéphane Raimbault <stephane.raimbault@gmail.com>
+ * Copyright © 2008-2010 Stéphane Raimbault <stephane.raimbault@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "modbus.h"
+#include <modbus/modbus.h>
 #include "unit-test.h"
 
 int main(void)