diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 00000000..47ae03f0
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,21 @@
+noinst_LTLIBRARIES=libamf.la libauth.la libbase64.la libconfig.la libcrypto.la libdtsc.la libflv_tag.la libhttp_parser.la libjson.la libprocs.la librtmpchunks.la libsocket.la libtinythread.la libmp4.la libts_packet.la
+libamf_la_SOURCES=amf.h amf.cpp
+libauth_la_SOURCES=auth.h auth.cpp
+libauth_la_LIBADD=-lssl -lcrypto
+libbase64_la_SOURCES=base64.h base64.cpp
+libconfig_la_SOURCES=config.h config.cpp
+libcrypto_la_SOURCES=crypto.h crypto.cpp
+libcrypto_la_LIBADD=-lssl -lcrypto
+libdtsc_la_SOURCES=dtsc.h dtsc.cpp
+libflv_tag_la_SOURCES=flv_tag.h flv_tag.cpp
+libflv_tag_la_LIBADD=./libamf.la ./libsocket.la
+libhttp_parser_la_SOURCES=http_parser.h http_parser.cpp
+libjson_la_SOURCES=json.h json.cpp
+libprocs_la_SOURCES=procs.h procs.cpp
+librtmpchunks_la_SOURCES=rtmpchunks.h rtmpchunks.cpp
+librtmpchunks_la_LIBADD=./libflv_tag.la -lssl -lcrypto
+libsocket_la_SOURCES=socket.h socket.cpp
+libtinythread_la_SOURCES=tinythread.h tinythread.cpp
+libtinythread_la_LIBADD=-lpthread
+libmp4_la_SOURCES=mp4.h mp4.cpp
+libts_packet_la_SOURCES=ts_packet.h ts_packet.cpp
diff --git a/lib/ts_packet.cpp b/lib/ts_packet.cpp
new file mode 100644
index 00000000..4e1deede
--- /dev/null
+++ b/lib/ts_packet.cpp
@@ -0,0 +1,9 @@
+#include "ts_packet.h"
+
+TS_Packet::TS_Packet() {
+  Free = 187;
+  Buffer[0] = 0x47;
+  for( int i = 1; i < 188; i++ ) {
+    Buffer[i] = 0x00;
+  }
+}
diff --git a/lib/ts_packet.h b/lib/ts_packet.h
new file mode 100644
index 00000000..82a2b0e4
--- /dev/null
+++ b/lib/ts_packet.h
@@ -0,0 +1,20 @@
+#pragma once
+
+class TS_Packet {
+  public:
+    TS_Packet();
+    ~TS_Packet();
+    void PID( int NewVal );
+    int PID();
+    void ContinuityCounter( int NewVal );
+    int ContinuityCounter();
+    void MsgLen( int NewVal );
+    int MsgLen();
+    void Clear();
+    void SetPAT();
+    void SetPMT();
+    int Free();
+  private:
+    int Free;
+    char Buffer[188];///< The actual data
+};
diff --git a/src/conn_ts.cpp b/src/conn_ts.cpp
index 088a55ab..faa5a67f 100644
--- a/src/conn_ts.cpp
+++ b/src/conn_ts.cpp
@@ -361,4 +361,4 @@ int TS_Handler( Socket::Connection conn ) {
 #define DEFAULT_PORT 8888
 #define MAINHANDLER TS_Handler
 #define CONFIGSECT TS
-#include "../util/server_setup.cpp"
+#include "server_setup.h"