diff --git a/httpd/.gitignore b/.gitignore
similarity index 100%
rename from httpd/.gitignore
rename to .gitignore
diff --git a/httpd/Makefile b/Makefile
similarity index 100%
rename from httpd/Makefile
rename to Makefile
diff --git a/httpd/src/config/config.c b/src/config/config.c
similarity index 100%
rename from httpd/src/config/config.c
rename to src/config/config.c
diff --git a/httpd/src/config/config.h b/src/config/config.h
similarity index 100%
rename from httpd/src/config/config.h
rename to src/config/config.h
diff --git a/httpd/src/daemon/daemon.c b/src/daemon/daemon.c
similarity index 100%
rename from httpd/src/daemon/daemon.c
rename to src/daemon/daemon.c
diff --git a/httpd/src/daemon/daemon.h b/src/daemon/daemon.h
similarity index 100%
rename from httpd/src/daemon/daemon.h
rename to src/daemon/daemon.h
diff --git a/httpd/src/http/headers.c b/src/http/headers.c
similarity index 100%
rename from httpd/src/http/headers.c
rename to src/http/headers.c
diff --git a/httpd/src/http/headers.h b/src/http/headers.h
similarity index 100%
rename from httpd/src/http/headers.h
rename to src/http/headers.h
diff --git a/httpd/src/http/http.c b/src/http/http.c
similarity index 100%
rename from httpd/src/http/http.c
rename to src/http/http.c
diff --git a/httpd/src/http/http.h b/src/http/http.h
similarity index 100%
rename from httpd/src/http/http.h
rename to src/http/http.h
diff --git a/httpd/src/logger/errors.c b/src/logger/errors.c
similarity index 100%
rename from httpd/src/logger/errors.c
rename to src/logger/errors.c
diff --git a/httpd/src/logger/errors.h b/src/logger/errors.h
similarity index 100%
rename from httpd/src/logger/errors.h
rename to src/logger/errors.h
diff --git a/httpd/src/logger/logs.c b/src/logger/logs.c
similarity index 100%
rename from httpd/src/logger/logs.c
rename to src/logger/logs.c
diff --git a/httpd/src/logger/logs.h b/src/logger/logs.h
similarity index 100%
rename from httpd/src/logger/logs.h
rename to src/logger/logs.h
diff --git a/httpd/src/main.c b/src/main.c
similarity index 100%
rename from httpd/src/main.c
rename to src/main.c
diff --git a/httpd/src/server/server.c b/src/server/server.c
similarity index 100%
rename from httpd/src/server/server.c
rename to src/server/server.c
diff --git a/httpd/src/server/server.h b/src/server/server.h
similarity index 100%
rename from httpd/src/server/server.h
rename to src/server/server.h
diff --git a/httpd/src/utils/files/files.c b/src/utils/files/files.c
similarity index 100%
rename from httpd/src/utils/files/files.c
rename to src/utils/files/files.c
diff --git a/httpd/src/utils/files/files.h b/src/utils/files/files.h
similarity index 100%
rename from httpd/src/utils/files/files.h
rename to src/utils/files/files.h
diff --git a/httpd/src/utils/parsing/blanks.c b/src/utils/parsing/blanks.c
similarity index 100%
rename from httpd/src/utils/parsing/blanks.c
rename to src/utils/parsing/blanks.c
diff --git a/httpd/src/utils/parsing/blanks.h b/src/utils/parsing/blanks.h
similarity index 100%
rename from httpd/src/utils/parsing/blanks.h
rename to src/utils/parsing/blanks.h
diff --git a/httpd/src/utils/parsing/words.c b/src/utils/parsing/words.c
similarity index 100%
rename from httpd/src/utils/parsing/words.c
rename to src/utils/parsing/words.c
diff --git a/httpd/src/utils/parsing/words.h b/src/utils/parsing/words.h
similarity index 100%
rename from httpd/src/utils/parsing/words.h
rename to src/utils/parsing/words.h
diff --git a/httpd/src/utils/string/string.c b/src/utils/string/string.c
similarity index 100%
rename from httpd/src/utils/string/string.c
rename to src/utils/string/string.c
diff --git a/httpd/src/utils/string/string.h b/src/utils/string/string.h
similarity index 100%
rename from httpd/src/utils/string/string.h
rename to src/utils/string/string.h
diff --git a/httpd/src/utils/time/fmt_time.c b/src/utils/time/fmt_time.c
similarity index 100%
rename from httpd/src/utils/time/fmt_time.c
rename to src/utils/time/fmt_time.c
diff --git a/httpd/src/utils/time/fmt_time.h b/src/utils/time/fmt_time.h
similarity index 100%
rename from httpd/src/utils/time/fmt_time.h
rename to src/utils/time/fmt_time.h
diff --git a/httpd/tests/config.txt b/tests/config.txt
similarity index 100%
rename from httpd/tests/config.txt
rename to tests/config.txt
diff --git a/httpd/tests/config_reader.sh b/tests/config_reader.sh
similarity index 100%
rename from httpd/tests/config_reader.sh
rename to tests/config_reader.sh
diff --git a/httpd/tests/test_root_dir/index.html b/tests/test_root_dir/index.html
similarity index 100%
rename from httpd/tests/test_root_dir/index.html
rename to tests/test_root_dir/index.html
diff --git a/httpd/tests/test_suite.py b/tests/test_suite.py
similarity index 100%
rename from httpd/tests/test_suite.py
rename to tests/test_suite.py
diff --git a/httpd/tests/tests_mieux.sh b/tests/tests_mieux.sh
similarity index 100%
rename from httpd/tests/tests_mieux.sh
rename to tests/tests_mieux.sh