diff --git a/README.md b/README.md
index d4b427af..ba88f4cd 100644
--- a/README.md
+++ b/README.md
@@ -37,6 +37,7 @@ Or using git version >= 1.6.5
 ### protocol
 * __http__: HTTP related classes, constants for status code, content types, ... [read more](library/protocol/http)
 * __uri_template__: URI Template library (parsing and expander) [read more](library/protocol/uri_template)
+* __CONNEG__: CONNEG library (Content-type Negociation) [read more](library/protocol/CONNEG)
 
 ### client
 * __http_client__: simple HTTP client based on cURL [read more](library/client/http_client)
diff --git a/library/protocol/CONNEG/library/conneg-safe.ecf b/library/protocol/CONNEG/conneg-safe.ecf
similarity index 64%
rename from library/protocol/CONNEG/library/conneg-safe.ecf
rename to library/protocol/CONNEG/conneg-safe.ecf
index cb94e049..b666dfd6 100644
--- a/library/protocol/CONNEG/library/conneg-safe.ecf
+++ b/library/protocol/CONNEG/conneg-safe.ecf
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-7-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-7-0 http://www.eiffel.com/developers/xml/configuration-1-7-0.xsd" name="conneg" uuid="EB2019A3-8E12-43AF-B086-BF9C399507B7" readonly="false" library_target="conneg">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-7-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-7-0 http://www.eiffel.com/developers/xml/configuration-1-7-0.xsd" name="conneg" uuid="D15DC4C4-D74F-4E4B-B4B1-2B03A35A284D" library_target="conneg">
 	<target name="conneg">
 		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/.git$</exclude>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+		</file_rule>
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="standard">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<cluster name="conneg" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/.git$</exclude>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="conneg" location=".\src" recursive="true"/>
 	</target>
 </system>
diff --git a/library/protocol/CONNEG/library/conneg.ecf b/library/protocol/CONNEG/conneg.ecf
similarity index 66%
rename from library/protocol/CONNEG/library/conneg.ecf
rename to library/protocol/CONNEG/conneg.ecf
index 258bd52d..e8676ca1 100644
--- a/library/protocol/CONNEG/library/conneg.ecf
+++ b/library/protocol/CONNEG/conneg.ecf
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-7-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-7-0 http://www.eiffel.com/developers/xml/configuration-1-7-0.xsd" name="conneg" uuid="D15DC4C4-D74F-4E4B-B4B1-2B03A35A284D" readonly="false" library_target="conneg">
-	<target name="emime">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-7-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-7-0 http://www.eiffel.com/developers/xml/configuration-1-7-0.xsd" name="conneg" uuid="D15DC4C4-D74F-4E4B-B4B1-2B03A35A284D" library_target="conneg">
+	<target name="conneg">
 		<root all_classes="true"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+			<exclude>/.git$</exclude>
+		</file_rule>
 		<option warning="true" full_class_checking="true">
 			<assertions precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<cluster name="conneg" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-				<exclude>/.git$</exclude>
-			</file_rule>
-		</cluster>
-		
+		<cluster name="conneg" location=".\src" recursive="true"/>
 	</target>
 </system>
diff --git a/library/protocol/CONNEG/library/license.lic b/library/protocol/CONNEG/license.lic
similarity index 100%
rename from library/protocol/CONNEG/library/license.lic
rename to library/protocol/CONNEG/license.lic
diff --git a/library/protocol/CONNEG/library/.gitignore b/library/protocol/CONNEG/src/.gitignore
similarity index 100%
rename from library/protocol/CONNEG/library/.gitignore
rename to library/protocol/CONNEG/src/.gitignore
diff --git a/library/protocol/CONNEG/library/common_accept_header_parser.e b/library/protocol/CONNEG/src/common_accept_header_parser.e
similarity index 100%
rename from library/protocol/CONNEG/library/common_accept_header_parser.e
rename to library/protocol/CONNEG/src/common_accept_header_parser.e
diff --git a/library/protocol/CONNEG/library/common_results.e b/library/protocol/CONNEG/src/common_results.e
similarity index 100%
rename from library/protocol/CONNEG/library/common_results.e
rename to library/protocol/CONNEG/src/common_results.e
diff --git a/library/protocol/CONNEG/library/fitness_and_quality.e b/library/protocol/CONNEG/src/fitness_and_quality.e
similarity index 100%
rename from library/protocol/CONNEG/library/fitness_and_quality.e
rename to library/protocol/CONNEG/src/fitness_and_quality.e
diff --git a/library/protocol/CONNEG/library/language_parse.e b/library/protocol/CONNEG/src/language_parse.e
similarity index 100%
rename from library/protocol/CONNEG/library/language_parse.e
rename to library/protocol/CONNEG/src/language_parse.e
diff --git a/library/protocol/CONNEG/library/language_results.e b/library/protocol/CONNEG/src/language_results.e
similarity index 100%
rename from library/protocol/CONNEG/library/language_results.e
rename to library/protocol/CONNEG/src/language_results.e
diff --git a/library/protocol/CONNEG/library/mime_parse.e b/library/protocol/CONNEG/src/mime_parse.e
similarity index 100%
rename from library/protocol/CONNEG/library/mime_parse.e
rename to library/protocol/CONNEG/src/mime_parse.e
diff --git a/library/protocol/CONNEG/library/parse_results.e b/library/protocol/CONNEG/src/parse_results.e
similarity index 100%
rename from library/protocol/CONNEG/library/parse_results.e
rename to library/protocol/CONNEG/src/parse_results.e
diff --git a/library/protocol/CONNEG/library/shared_conneg.e b/library/protocol/CONNEG/src/shared_conneg.e
similarity index 100%
rename from library/protocol/CONNEG/library/shared_conneg.e
rename to library/protocol/CONNEG/src/shared_conneg.e
diff --git a/library/protocol/CONNEG/library/variants.e b/library/protocol/CONNEG/src/variants.e
similarity index 100%
rename from library/protocol/CONNEG/library/variants.e
rename to library/protocol/CONNEG/src/variants.e
diff --git a/library/protocol/CONNEG/test/test-safe.ecf b/library/protocol/CONNEG/test/test-safe.ecf
index acb07776..9fb46bd4 100644
--- a/library/protocol/CONNEG/test/test-safe.ecf
+++ b/library/protocol/CONNEG/test/test-safe.ecf
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-6-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-6-0 http://www.eiffel.com/developers/xml/configuration-1-6-0.xsd" name="test" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-6-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-6-0 http://www.eiffel.com/developers/xml/configuration-1-6-0.xsd" name="test" uuid="7860561C-779A-4E45-A7B9-06A1E0E984E8">
 	<target name="test">
 		<root class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+			<exclude>/.git$</exclude>
+		</file_rule>
 		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="conneg" location="..\library\conneg-safe.ecf"/>
+		<library name="conneg" location="..\conneg-safe.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing-safe.ecf"/>
-		<cluster name="test" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-				<exclude>/.git$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="test" location=".\" recursive="true"/>
 	</target>
 </system>
diff --git a/library/protocol/CONNEG/test/test.ecf b/library/protocol/CONNEG/test/test.ecf
index dbacffdd..88d3dec7 100644
--- a/library/protocol/CONNEG/test/test.ecf
+++ b/library/protocol/CONNEG/test/test.ecf
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test" uuid="EA141B17-6A21-4781-8B5F-E9939BAE968A">
+<system xmlns="http://www.eiffel.com/developers/xml/configuration-1-8-0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.eiffel.com/developers/xml/configuration-1-8-0 http://www.eiffel.com/developers/xml/configuration-1-8-0.xsd" name="test" uuid="7860561C-779A-4E45-A7B9-06A1E0E984E8">
 	<target name="test">
 		<root class="APPLICATION" feature="make"/>
+		<file_rule>
+			<exclude>/EIFGENs$</exclude>
+			<exclude>/CVS$</exclude>
+			<exclude>/.svn$</exclude>
+			<exclude>/.git$</exclude>
+		</file_rule>
 		<option warning="true">
 			<assertions precondition="true" postcondition="true" check="true" invariant="true" loop="true" supplier_precondition="true"/>
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
-		<library name="base_extension" location="$ISE_LIBRARY\library\base_extension\base_extension-safe.ecf"/>
-		<library name="conneg" location="..\library\conneg.ecf"/>
+		<library name="conneg" location="..\conneg.ecf"/>
 		<library name="testing" location="$ISE_LIBRARY\library\testing\testing.ecf"/>
-		<cluster name="test" location=".\" recursive="true">
-			<file_rule>
-				<exclude>/.git$</exclude>
-				<exclude>/EIFGENs$</exclude>
-				<exclude>/CVS$</exclude>
-				<exclude>/.svn$</exclude>
-			</file_rule>
-		</cluster>
+		<cluster name="test" location=".\" recursive="true"/>
 	</target>
 </system>