diff --git a/include/nopoll/nopoll.h b/components/nopoll/include/nopoll/nopoll.h
similarity index 100%
rename from include/nopoll/nopoll.h
rename to components/nopoll/include/nopoll/nopoll.h
diff --git a/include/nopoll/nopoll_config.h b/components/nopoll/include/nopoll/nopoll_config.h
similarity index 100%
rename from include/nopoll/nopoll_config.h
rename to components/nopoll/include/nopoll/nopoll_config.h
diff --git a/include/nopoll/nopoll_conn.h b/components/nopoll/include/nopoll/nopoll_conn.h
similarity index 100%
rename from include/nopoll/nopoll_conn.h
rename to components/nopoll/include/nopoll/nopoll_conn.h
diff --git a/include/nopoll/nopoll_conn_opts.h b/components/nopoll/include/nopoll/nopoll_conn_opts.h
similarity index 100%
rename from include/nopoll/nopoll_conn_opts.h
rename to components/nopoll/include/nopoll/nopoll_conn_opts.h
diff --git a/include/nopoll/nopoll_ctx.h b/components/nopoll/include/nopoll/nopoll_ctx.h
similarity index 100%
rename from include/nopoll/nopoll_ctx.h
rename to components/nopoll/include/nopoll/nopoll_ctx.h
diff --git a/include/nopoll/nopoll_decl.h b/components/nopoll/include/nopoll/nopoll_decl.h
similarity index 100%
rename from include/nopoll/nopoll_decl.h
rename to components/nopoll/include/nopoll/nopoll_decl.h
diff --git a/include/nopoll/nopoll_handlers.h b/components/nopoll/include/nopoll/nopoll_handlers.h
similarity index 100%
rename from include/nopoll/nopoll_handlers.h
rename to components/nopoll/include/nopoll/nopoll_handlers.h
diff --git a/include/nopoll/nopoll_io.h b/components/nopoll/include/nopoll/nopoll_io.h
similarity index 100%
rename from include/nopoll/nopoll_io.h
rename to components/nopoll/include/nopoll/nopoll_io.h
diff --git a/include/nopoll/nopoll_listener.h b/components/nopoll/include/nopoll/nopoll_listener.h
similarity index 100%
rename from include/nopoll/nopoll_listener.h
rename to components/nopoll/include/nopoll/nopoll_listener.h
diff --git a/include/nopoll/nopoll_log.h b/components/nopoll/include/nopoll/nopoll_log.h
similarity index 100%
rename from include/nopoll/nopoll_log.h
rename to components/nopoll/include/nopoll/nopoll_log.h
diff --git a/include/nopoll/nopoll_loop.h b/components/nopoll/include/nopoll/nopoll_loop.h
similarity index 100%
rename from include/nopoll/nopoll_loop.h
rename to components/nopoll/include/nopoll/nopoll_loop.h
diff --git a/include/nopoll/nopoll_msg.h b/components/nopoll/include/nopoll/nopoll_msg.h
similarity index 100%
rename from include/nopoll/nopoll_msg.h
rename to components/nopoll/include/nopoll/nopoll_msg.h
diff --git a/include/nopoll/nopoll_private.h b/components/nopoll/include/nopoll/nopoll_private.h
similarity index 100%
rename from include/nopoll/nopoll_private.h
rename to components/nopoll/include/nopoll/nopoll_private.h
diff --git a/include/nopoll/nopoll_win32.h b/components/nopoll/include/nopoll/nopoll_win32.h
similarity index 100%
rename from include/nopoll/nopoll_win32.h
rename to components/nopoll/include/nopoll/nopoll_win32.h
diff --git a/third_party/nopoll/Makefile b/components/nopoll/library/Makefile
similarity index 100%
rename from third_party/nopoll/Makefile
rename to components/nopoll/library/Makefile
diff --git a/third_party/nopoll/nopoll-regression-client.c b/components/nopoll/library/nopoll-regression-client.c
similarity index 100%
rename from third_party/nopoll/nopoll-regression-client.c
rename to components/nopoll/library/nopoll-regression-client.c
diff --git a/third_party/nopoll/nopoll.c b/components/nopoll/library/nopoll.c
similarity index 100%
rename from third_party/nopoll/nopoll.c
rename to components/nopoll/library/nopoll.c
diff --git a/third_party/nopoll/nopoll_conn.c b/components/nopoll/library/nopoll_conn.c
similarity index 100%
rename from third_party/nopoll/nopoll_conn.c
rename to components/nopoll/library/nopoll_conn.c
diff --git a/third_party/nopoll/nopoll_conn_opts.c b/components/nopoll/library/nopoll_conn_opts.c
similarity index 100%
rename from third_party/nopoll/nopoll_conn_opts.c
rename to components/nopoll/library/nopoll_conn_opts.c
diff --git a/third_party/nopoll/nopoll_ctx.c b/components/nopoll/library/nopoll_ctx.c
similarity index 100%
rename from third_party/nopoll/nopoll_ctx.c
rename to components/nopoll/library/nopoll_ctx.c
diff --git a/third_party/nopoll/nopoll_decl.c b/components/nopoll/library/nopoll_decl.c
similarity index 100%
rename from third_party/nopoll/nopoll_decl.c
rename to components/nopoll/library/nopoll_decl.c
diff --git a/third_party/nopoll/nopoll_io.c b/components/nopoll/library/nopoll_io.c
similarity index 100%
rename from third_party/nopoll/nopoll_io.c
rename to components/nopoll/library/nopoll_io.c
diff --git a/third_party/nopoll/nopoll_listener.c b/components/nopoll/library/nopoll_listener.c
similarity index 100%
rename from third_party/nopoll/nopoll_listener.c
rename to components/nopoll/library/nopoll_listener.c
diff --git a/third_party/nopoll/nopoll_log.c b/components/nopoll/library/nopoll_log.c
similarity index 100%
rename from third_party/nopoll/nopoll_log.c
rename to components/nopoll/library/nopoll_log.c
diff --git a/third_party/nopoll/nopoll_loop.c b/components/nopoll/library/nopoll_loop.c
similarity index 100%
rename from third_party/nopoll/nopoll_loop.c
rename to components/nopoll/library/nopoll_loop.c
diff --git a/third_party/nopoll/nopoll_msg.c b/components/nopoll/library/nopoll_msg.c
similarity index 100%
rename from third_party/nopoll/nopoll_msg.c
rename to components/nopoll/library/nopoll_msg.c
diff --git a/third_party/nopoll/nopoll_win32.c b/components/nopoll/library/nopoll_win32.c
similarity index 100%
rename from third_party/nopoll/nopoll_win32.c
rename to components/nopoll/library/nopoll_win32.c