diff --git a/cam2ip.go b/cam2ip.go
index 68a7f85..78c9b09 100644
--- a/cam2ip.go
+++ b/cam2ip.go
@@ -38,7 +38,7 @@ func main() {
 		}
 	}
 
-	srv.Camera, err = camera.NewCamera(srv.Index)
+	srv.Camera, err = camera.New(srv.Index)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
 		os.Exit(1)
diff --git a/camera/camera.go b/camera/camera.go
index 948c43f..4bf556f 100644
--- a/camera/camera.go
+++ b/camera/camera.go
@@ -57,8 +57,8 @@ type Camera struct {
 	camera *opencv.Capture
 }
 
-// NewCamera returns new Camera for given camera index.
-func NewCamera(index int) (camera *Camera, err error) {
+// New returns new Camera for given camera index.
+func New(index int) (camera *Camera, err error) {
 	camera = &Camera{}
 	camera.Index = index
 
diff --git a/camera/camera_test.go b/camera/camera_test.go
index b581c17..b301d4a 100644
--- a/camera/camera_test.go
+++ b/camera/camera_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestCamera(t *testing.T) {
-	camera, err := NewCamera(1)
+	camera, err := New(1)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/camera/encode.go b/encoder/encode.go
similarity index 79%
rename from camera/encode.go
rename to encoder/encode.go
index 7d287d5..6164c95 100644
--- a/camera/encode.go
+++ b/encoder/encode.go
@@ -1,4 +1,4 @@
-package camera
+package encoder
 
 import (
 	"image"
@@ -8,8 +8,8 @@ import (
 	jpeg "github.com/antonini/golibjpegturbo"
 )
 
-// NewEncoder returns a new Encoder.
-func NewEncoder(w io.Writer) *Encoder {
+// New returns a new Encoder.
+func New(w io.Writer) *Encoder {
 	return &Encoder{w}
 }
 
diff --git a/handlers/jpeg.go b/handlers/jpeg.go
index eeff278..a7baaa3 100644
--- a/handlers/jpeg.go
+++ b/handlers/jpeg.go
@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gen2brain/cam2ip/camera"
+	"github.com/gen2brain/cam2ip/encoder"
 )
 
 // JPEG handler.
@@ -34,9 +35,7 @@ func (j *JPEG) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	enc := camera.NewEncoder(w)
-
-	err = enc.Encode(img)
+	err = encoder.New(w).Encode(img)
 	if err != nil {
 		log.Printf("jpeg: encode: %v", err)
 		return
diff --git a/handlers/mjpeg.go b/handlers/mjpeg.go
index 7d8d524..83c0567 100644
--- a/handlers/mjpeg.go
+++ b/handlers/mjpeg.go
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/gen2brain/cam2ip/camera"
+	"github.com/gen2brain/cam2ip/encoder"
 )
 
 // MJPEG handler.
@@ -61,9 +62,7 @@ loop:
 				continue
 			}
 
-			enc := camera.NewEncoder(partWriter)
-
-			err = enc.Encode(img)
+			err = encoder.New(partWriter).Encode(img)
 			if err != nil {
 				log.Printf("mjpeg: encode: %v", err)
 				continue
diff --git a/handlers/socket.go b/handlers/socket.go
index 700234e..374a08a 100644
--- a/handlers/socket.go
+++ b/handlers/socket.go
@@ -9,6 +9,7 @@ import (
 	"golang.org/x/net/websocket"
 
 	"github.com/gen2brain/cam2ip/camera"
+	"github.com/gen2brain/cam2ip/encoder"
 )
 
 // Socket handler.
@@ -33,9 +34,8 @@ func (s *Socket) write(ws *websocket.Conn) {
 		}
 
 		w := new(bytes.Buffer)
-		enc := camera.NewEncoder(w)
 
-		err = enc.Encode(img)
+		err = encoder.New(w).Encode(img)
 		if err != nil {
 			log.Printf("socket: encode: %v", err)
 			continue