diff --git a/.gitignore b/.gitignore
index 6a2c80b..3cc55e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *.mp4
 *.jpg
 *.jpeg
-ipcamera
+ipcamera/ipcamera
diff --git a/ipcamera.go b/ipcamera.go
deleted file mode 100644
index e6bb1e7..0000000
--- a/ipcamera.go
+++ /dev/null
@@ -1,203 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/binary"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-
-	"github.com/spf13/cobra"
-)
-
-func main() {
-	var username string
-	var password string
-	var port int16
-
-	var rootCmd = &cobra.Command{
-		Use:   "ipcamera [Cameras IP Address]",
-		Short: "ipcamera is a tool to stream the video preview of cheap action cameras without the mobile application",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			relay := CreateRTPRelay(net.ParseIP("127.0.0.1"), 5220)
-			defer relay.Stop()
-
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			log.Printf("Using Camera: %+v\n", camera)
-
-			camera.Connect()
-			camera.Login()
-			camera.StartPreviewStream()
-
-			bufio.NewReader(os.Stdin).ReadBytes('\n')
-		},
-	}
-
-	rootCmd.PersistentFlags().Int16VarP(&port, "port", "P", 6666, "Specify an alternative camera port to connect to")
-	rootCmd.PersistentFlags().StringVarP(&username, "username", "u", "admin", "Specify the camera username")
-	rootCmd.PersistentFlags().StringVarP(&password, "password", "p", "12345", "Specify the camera password")
-
-	var ls = &cobra.Command{
-		Use:   "ls [Cameras IP Address]",
-		Short: "List files stored on the cameras SD-Card",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.SetVerbose(false)
-
-			camera.Connect()
-			camera.Login()
-			files, err := camera.GetFileList()
-			if err != nil {
-				log.Printf("ERROR Receiving File List: %s\n", err)
-				return
-			}
-
-			for _, file := range files {
-				fmt.Printf("%s\t%d\n", file.Path, file.Size)
-			}
-		},
-	}
-
-	var still = &cobra.Command{
-		Use:   "still [Cameras IP Address]",
-		Short: "Take a still image and save to SD-Card",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.Connect()
-			camera.Login()
-
-			camera.TakePicture()
-		},
-	}
-
-	var record = &cobra.Command{
-		Use:   "record [Cameras IP Address]",
-		Short: "Start recording video to SD-Card",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.Connect()
-			camera.Login()
-
-			camera.StartRecording()
-		},
-	}
-
-	var stop = &cobra.Command{
-		Use:   "stop [Cameras IP Address]",
-		Short: "Stop recording video to SD-Card",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.Connect()
-			camera.Login()
-
-			camera.StopRecording()
-		},
-	}
-
-	var cmd = &cobra.Command{
-		Use:   "cmd [RAW Command] [Cameras IP Address]",
-		Short: "Send a raw command to the camera",
-		Args:  cobra.ExactArgs(2),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.Connect()
-			camera.Login()
-
-			command, err := hex.DecodeString(args[0])
-			if err != nil {
-				log.Printf("ERROR: %s\n", err)
-				return
-			}
-
-			if len(command) >= 2 {
-				header := CreateCommandHeader(uint32(binary.BigEndian.Uint16(command[:2])))
-				payload := command[2:]
-				packet := CreatePacket(header, payload)
-				log.Printf("Sending Command: %X\n", packet)
-				camera.SendPacket(packet)
-			}
-
-			log.Printf("Waiting for Data, press ENTER to quit")
-			bufio.NewReader(os.Stdin).ReadBytes('\n')
-		},
-	}
-
-	var fetch = &cobra.Command{
-		Use:   "fetch [Cameras IP Address]",
-		Short: "List files stored on the cameras SD-Card",
-		Args:  cobra.ExactArgs(1),
-		Run: func(cmd *cobra.Command, args []string) {
-			camera := CreateCamera(net.ParseIP(args[0]), int(port), username, password)
-			defer camera.Disconnect()
-
-			camera.Connect()
-			camera.Login()
-
-			files, err := camera.GetFileList()
-			if err != nil {
-				log.Printf("ERROR Receiving File List: %s\n", err)
-				return
-			}
-
-			newestFile := files[len(files)-1].Path
-			url := "http://" + args[0] + newestFile
-			log.Printf("Downloading latest File: %s\n", url)
-			downloadFile(filepath.Base(newestFile), url)
-		},
-	}
-
-	rootCmd.AddCommand(ls)
-	rootCmd.AddCommand(cmd)
-	rootCmd.AddCommand(still)
-	rootCmd.AddCommand(stop)
-	rootCmd.AddCommand(fetch)
-	rootCmd.AddCommand(record)
-
-	if err := rootCmd.Execute(); err != nil {
-		log.Println(err)
-		os.Exit(1)
-	}
-}
-
-func downloadFile(filepath string, url string) error {
-
-	// Get the data
-	resp, err := http.Get(url)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	// Create the file
-	out, err := os.Create(filepath)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-
-	// Write the body to file
-	_, err = io.Copy(out, resp.Body)
-	return err
-}