diff --git a/cmd/ffmpegd.go b/cmd/ffmpegd.go
index 05e3038..20f2684 100644
--- a/cmd/ffmpegd.go
+++ b/cmd/ffmpegd.go
@@ -1,4 +1,4 @@
-package main
+package cmd
 
 import (
 	"encoding/json"
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/alfg/ffmpegd"
+	"github.com/alfg/ffmpegd/ffmpeg"
 	"github.com/gorilla/websocket"
 )
 
@@ -84,7 +84,7 @@ type file struct {
 	Size int64  `json:"size"`
 }
 
-func main() {
+func Run() {
 	// CLI Banner.
 	printBanner()
 
@@ -208,15 +208,15 @@ func handleMessages() {
 }
 
 func verifyFFmpeg() error {
-	ffmpeg := &ffmpegd.FFmpeg{}
-	version, err := ffmpeg.Version()
+	f := &ffmpeg.FFmpeg{}
+	version, err := f.Version()
 	if err != nil {
 		return err
 	}
 	fmt.Println("  Checking FFmpeg version....\u001b[32m" + version + "\u001b[0m")
 
-	ffprobe := &ffmpegd.FFProbe{}
-	version, err = ffprobe.Version()
+	probe := &ffmpeg.FFProbe{}
+	version, err = probe.Version()
 	if err != nil {
 		return err
 	}
@@ -225,14 +225,14 @@ func verifyFFmpeg() error {
 }
 
 func runEncode(input, output, payload string) {
-	probe := ffmpegd.FFProbe{}
+	probe := ffmpeg.FFProbe{}
 	probeData, err := probe.Run(input)
 	if err != nil {
 		sendError(err)
 		return
 	}
 
-	ffmpeg := &ffmpegd.FFmpeg{}
+	ffmpeg := &ffmpeg.FFmpeg{}
 	go trackEncodeProgress(probeData, ffmpeg)
 	err = ffmpeg.Run(input, output, payload)
 
@@ -271,7 +271,7 @@ func sendError(err error) {
 	}
 }
 
-func trackEncodeProgress(p *ffmpegd.FFProbeResponse, f *ffmpegd.FFmpeg) {
+func trackEncodeProgress(p *ffmpeg.FFProbeResponse, f *ffmpeg.FFmpeg) {
 	progressCh = make(chan struct{})
 	ticker := time.NewTicker(progressInterval)
 
diff --git a/ffmpeg.go b/ffmpeg/ffmpeg.go
similarity index 99%
rename from ffmpeg.go
rename to ffmpeg/ffmpeg.go
index 1d6b468..ab61bb0 100644
--- a/ffmpeg.go
+++ b/ffmpeg/ffmpeg.go
@@ -1,4 +1,4 @@
-package ffmpegd
+package ffmpeg
 
 import (
 	"bufio"
diff --git a/ffprobe.go b/ffmpeg/ffprobe.go
similarity index 99%
rename from ffprobe.go
rename to ffmpeg/ffprobe.go
index 769be12..eca3c8f 100644
--- a/ffprobe.go
+++ b/ffmpeg/ffprobe.go
@@ -1,4 +1,4 @@
-package ffmpegd
+package ffmpeg
 
 import (
 	"encoding/json"
diff --git a/ffmpegd.go b/ffmpegd.go
new file mode 100644
index 0000000..1a58afc
--- /dev/null
+++ b/ffmpegd.go
@@ -0,0 +1,7 @@
+package main
+
+import "github.com/alfg/ffmpegd/cmd"
+
+func main() {
+	cmd.Run()
+}