diff --git a/rtmp/rtmp.go b/rtmp/rtmp.go
index e200387a..e9392019 100644
--- a/rtmp/rtmp.go
+++ b/rtmp/rtmp.go
@@ -3,7 +3,7 @@ NAME
   rtmp.go
 
 DESCRIPTION
-  See Readme.md
+  RTMP command functionality.
 
 AUTHORS
   Saxon Nelson-Milton <saxon@ausocean.org>
@@ -49,6 +49,63 @@ const (
 	minDataSize = 11
 )
 
+const (
+	RTMPT_OPEN = iota
+	RTMPT_SEND
+	RTMPT_IDLE
+	RTMPT_CLOSE
+)
+
+const (
+	RTMP_READ_HEADER    = 0x01
+	RTMP_READ_RESUME    = 0x02
+	RTMP_READ_NO_IGNORE = 0x04
+	RTMP_READ_GOTKF     = 0x08
+	RTMP_READ_GOTFLVK   = 0x10
+	RTMP_READ_SEEKING   = 0x20
+	RTMP_READ_COMPLETE  = -3
+	RTMP_READ_ERROR     = -2
+	RTMP_READ_EOF       = -1
+	RTMP_READ_IGNORE    = 0
+)
+
+const (
+	RTMP_LF_AUTH = 0x0001 /* using auth param */
+	RTMP_LF_LIVE = 0x0002 /* stream is live */
+	RTMP_LF_SWFV = 0x0004 /* do SWF verification */
+	RTMP_LF_PLST = 0x0008 /* send playlist before play */
+	RTMP_LF_BUFX = 0x0010 /* toggle stream on BufferEmpty msg */
+	RTMP_LF_FTCU = 0x0020 /* free tcUrl on close */
+	RTMP_LF_FAPU = 0x0040 /* free app on close */
+)
+
+const (
+	RTMP_FEATURE_HTTP  = 0x01
+	RTMP_FEATURE_ENC   = 0x02
+	RTMP_FEATURE_SSL   = 0x04
+	RTMP_FEATURE_MFP   = 0x08 /* not yet supported */
+	RTMP_FEATURE_WRITE = 0x10 /* publish, not play */
+	RTMP_FEATURE_HTTP2 = 0x20 /* server-side rtmpt */
+)
+
+const (
+	RTMP_PROTOCOL_RTMP   = 0
+	RTMP_PROTOCOL_RTMPE  = RTMP_FEATURE_ENC
+	RTMP_PROTOCOL_RTMPT  = RTMP_FEATURE_HTTP
+	RTMP_PROTOCOL_RTMPS  = RTMP_FEATURE_SSL
+	RTMP_PROTOCOL_RTMPTE = (RTMP_FEATURE_HTTP | RTMP_FEATURE_ENC)
+	RTMP_PROTOCOL_RTMPTS = (RTMP_FEATURE_HTTP | RTMP_FEATURE_SSL)
+	RTMP_PROTOCOL_RTMFP  = RTMP_FEATURE_MFP
+)
+
+const (
+	RTMP_DEFAULT_CHUNKSIZE = 128
+	RTMP_BUFFER_CACHE_SIZE = (16 * 1024)
+	RTMP_SIG_SIZE          = 1536
+	RTMP_LARGE_HEADER_SIZE = 12
+	RTMP_MAX_HEADER_SIZE   = RTMP_LARGE_HEADER_SIZE
+)
+
 const (
 	setDataFrame = "@setDataFrame"
 
diff --git a/rtmp/rtmp_headers.go b/rtmp/rtmp_headers.go
index d50675b5..9c4854c5 100644
--- a/rtmp/rtmp_headers.go
+++ b/rtmp/rtmp_headers.go
@@ -33,87 +33,5 @@ LICENSE
 */
 package rtmp
 
-import (
-	"net"
-)
 
-const (
-	RTMPT_OPEN = iota
-	RTMPT_SEND
-	RTMPT_IDLE
-	RTMPT_CLOSE
-)
 
-const (
-	RTMP_READ_HEADER    = 0x01
-	RTMP_READ_RESUME    = 0x02
-	RTMP_READ_NO_IGNORE = 0x04
-	RTMP_READ_GOTKF     = 0x08
-	RTMP_READ_GOTFLVK   = 0x10
-	RTMP_READ_SEEKING   = 0x20
-	RTMP_READ_COMPLETE  = -3
-	RTMP_READ_ERROR     = -2
-	RTMP_READ_EOF       = -1
-	RTMP_READ_IGNORE    = 0
-)
-
-const (
-	RTMP_LF_AUTH = 0x0001 /* using auth param */
-	RTMP_LF_LIVE = 0x0002 /* stream is live */
-	RTMP_LF_SWFV = 0x0004 /* do SWF verification */
-	RTMP_LF_PLST = 0x0008 /* send playlist before play */
-	RTMP_LF_BUFX = 0x0010 /* toggle stream on BufferEmpty msg */
-	RTMP_LF_FTCU = 0x0020 /* free tcUrl on close */
-	RTMP_LF_FAPU = 0x0040 /* free app on close */
-)
-
-const (
-	RTMP_FEATURE_HTTP  = 0x01
-	RTMP_FEATURE_ENC   = 0x02
-	RTMP_FEATURE_SSL   = 0x04
-	RTMP_FEATURE_MFP   = 0x08 /* not yet supported */
-	RTMP_FEATURE_WRITE = 0x10 /* publish, not play */
-	RTMP_FEATURE_HTTP2 = 0x20 /* server-side rtmpt */
-)
-
-const (
-	RTMP_PROTOCOL_RTMP   = 0
-	RTMP_PROTOCOL_RTMPE  = RTMP_FEATURE_ENC
-	RTMP_PROTOCOL_RTMPT  = RTMP_FEATURE_HTTP
-	RTMP_PROTOCOL_RTMPS  = RTMP_FEATURE_SSL
-	RTMP_PROTOCOL_RTMPTE = (RTMP_FEATURE_HTTP | RTMP_FEATURE_ENC)
-	RTMP_PROTOCOL_RTMPTS = (RTMP_FEATURE_HTTP | RTMP_FEATURE_SSL)
-	RTMP_PROTOCOL_RTMFP  = RTMP_FEATURE_MFP
-)
-
-const (
-	RTMP_DEFAULT_CHUNKSIZE = 128
-	RTMP_BUFFER_CACHE_SIZE = (16 * 1024)
-	RTMP_SIG_SIZE          = 1536
-	RTMP_LARGE_HEADER_SIZE = 12
-	RTMP_MAX_HEADER_SIZE   = RTMP_LARGE_HEADER_SIZE
-)
-
-type link struct {
-	host     string
-	playpath string
-	tcUrl    string
-	swfUrl   string
-	pageUrl  string
-	app      string
-	auth     string
-	flashVer string
-	token    string
-	extras   C_AMFObject
-	lFlags   int32
-	swfAge   int32
-	protocol int32
-	timeout  uint
-	port     uint16
-	conn     *net.TCPConn
-}
-
-type method struct {
-	name string
-	num  int32
-}
diff --git a/rtmp/session.go b/rtmp/session.go
index 4b2538a5..2ea8e05f 100644
--- a/rtmp/session.go
+++ b/rtmp/session.go
@@ -3,7 +3,7 @@ NAME
   session.go
 
 DESCRIPTION
-  See Readme.md
+  RTMP session functionality.
 
 AUTHORS
   Saxon Nelson-Milton <saxon@ausocean.org>
@@ -35,6 +35,7 @@ package rtmp
 
 import (
 	"io"
+	"net"
 	"time"
 )
 
@@ -67,6 +68,32 @@ type Session struct {
 	log                  Log
 }
 
+// link represents RTMP URL and connection information.
+type link struct {
+	host     string
+	playpath string
+	tcUrl    string
+	swfUrl   string
+	pageUrl  string
+	app      string
+	auth     string
+	flashVer string
+	token    string
+	extras   C_AMFObject
+	lFlags   int32
+	swfAge   int32
+	protocol int32
+	timeout  uint
+	port     uint16
+	conn     *net.TCPConn
+}
+
+// method represents an RTMP method.
+type method struct {
+	name string
+	num  int32
+}
+
 // Log defines the RTMP logging function.
 type Log func(level int8, message string, params ...interface{})