diff --git a/payloads/characteristics.go b/payloads/characteristics.go
new file mode 100644
index 0000000..8f89201
--- /dev/null
+++ b/payloads/characteristics.go
@@ -0,0 +1,31 @@
+package payloads
+
+import (
+	"encoding/json"
+
+	"github.com/thermokarst/bactdb/models"
+)
+
+type CharacteristicPayload struct {
+	Characteristic *models.Characteristic     `json:"characteristic"`
+	Measurements   *models.Measurements       `json:"measurements"`
+	Strains        *models.Strains            `json:"strains"`
+	Species        *models.ManySpecies        `json:"species"`
+	Meta           *models.CharacteristicMeta `json:"meta"`
+}
+
+type CharacteristicsPayload struct {
+	Characteristics *models.Characteristics    `json:"characteristics"`
+	Measurements    *models.Measurements       `json:"measurements"`
+	Strains         *models.Strains            `json:"strains"`
+	Species         *models.ManySpecies        `json:"species"`
+	Meta            *models.CharacteristicMeta `json:"meta"`
+}
+
+func (c *CharacteristicPayload) Marshal() ([]byte, error) {
+	return json.Marshal(c)
+}
+
+func (c *CharacteristicsPayload) Marshal() ([]byte, error) {
+	return json.Marshal(c)
+}
diff --git a/payloads/measurements.go b/payloads/measurements.go
new file mode 100644
index 0000000..c35db68
--- /dev/null
+++ b/payloads/measurements.go
@@ -0,0 +1,25 @@
+package payloads
+
+import (
+	"encoding/json"
+
+	"github.com/thermokarst/bactdb/models"
+)
+
+type MeasurementPayload struct {
+	Measurement *models.Measurement `json:"measurement"`
+}
+
+type MeasurementsPayload struct {
+	Strains         *models.Strains         `json:"strains"`
+	Characteristics *models.Characteristics `json:"characteristics"`
+	Measurements    *models.Measurements    `json:"measurements"`
+}
+
+func (m *MeasurementPayload) Marshal() ([]byte, error) {
+	return json.Marshal(m)
+}
+
+func (m *MeasurementsPayload) Marshal() ([]byte, error) {
+	return json.Marshal(m)
+}
diff --git a/payloads/payloads.go b/payloads/payloads.go
deleted file mode 100644
index cabdd1c..0000000
--- a/payloads/payloads.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package payloads
-
-import (
-	"encoding/json"
-
-	"github.com/thermokarst/bactdb/models"
-)
-
-type CharacteristicPayload struct {
-	Characteristic *models.Characteristic     `json:"characteristic"`
-	Measurements   *models.Measurements       `json:"measurements"`
-	Strains        *models.Strains            `json:"strains"`
-	Species        *models.ManySpecies        `json:"species"`
-	Meta           *models.CharacteristicMeta `json:"meta"`
-}
-
-type CharacteristicsPayload struct {
-	Characteristics *models.Characteristics    `json:"characteristics"`
-	Measurements    *models.Measurements       `json:"measurements"`
-	Strains         *models.Strains            `json:"strains"`
-	Species         *models.ManySpecies        `json:"species"`
-	Meta            *models.CharacteristicMeta `json:"meta"`
-}
-
-func (c *CharacteristicPayload) Marshal() ([]byte, error) {
-	return json.Marshal(c)
-}
-
-func (c *CharacteristicsPayload) Marshal() ([]byte, error) {
-	return json.Marshal(c)
-}
-
-type MeasurementPayload struct {
-	Measurement *models.Measurement `json:"measurement"`
-}
-
-type MeasurementsPayload struct {
-	Strains         *models.Strains         `json:"strains"`
-	Characteristics *models.Characteristics `json:"characteristics"`
-	Measurements    *models.Measurements    `json:"measurements"`
-}
-
-func (m *MeasurementPayload) Marshal() ([]byte, error) {
-	return json.Marshal(m)
-}
-
-func (m *MeasurementsPayload) Marshal() ([]byte, error) {
-	return json.Marshal(m)
-}
-
-type SpeciesPayload struct {
-	Species *models.Species     `json:"species"`
-	Strains *models.Strains     `json:"strains"`
-	Meta    *models.SpeciesMeta `json:"meta"`
-}
-
-type ManySpeciesPayload struct {
-	Species *models.ManySpecies `json:"species"`
-	Strains *models.Strains     `json:"strains"`
-	Meta    *models.SpeciesMeta `json:"meta"`
-}
-
-func (s *SpeciesPayload) Marshal() ([]byte, error) {
-	return json.Marshal(s)
-}
-
-func (s *ManySpeciesPayload) Marshal() ([]byte, error) {
-	return json.Marshal(s)
-}
-
-type StrainPayload struct {
-	Strain          *models.Strain          `json:"strain"`
-	Species         *models.ManySpecies     `json:"species"`
-	Characteristics *models.Characteristics `json:"characteristics"`
-	Measurements    *models.Measurements    `json:"measurements"`
-	Meta            *models.StrainMeta      `json:"meta"`
-}
-
-type StrainsPayload struct {
-	Strains         *models.Strains         `json:"strains"`
-	Species         *models.ManySpecies     `json:"species"`
-	Characteristics *models.Characteristics `json:"characteristics"`
-	Measurements    *models.Measurements    `json:"measurements"`
-	Meta            *models.StrainMeta      `json:"meta"`
-}
-
-func (s *StrainPayload) Marshal() ([]byte, error) {
-	return json.Marshal(s)
-}
-
-func (s *StrainsPayload) Marshal() ([]byte, error) {
-	return json.Marshal(s)
-}
-
-type UserPayload struct {
-	User *models.User     `json:"user"`
-	Meta *models.UserMeta `json:"meta"`
-}
-
-func (u *UserPayload) Marshal() ([]byte, error) {
-	return json.Marshal(u)
-}
diff --git a/payloads/species.go b/payloads/species.go
new file mode 100644
index 0000000..39cbbc0
--- /dev/null
+++ b/payloads/species.go
@@ -0,0 +1,27 @@
+package payloads
+
+import (
+	"encoding/json"
+
+	"github.com/thermokarst/bactdb/models"
+)
+
+type SpeciesPayload struct {
+	Species *models.Species     `json:"species"`
+	Strains *models.Strains     `json:"strains"`
+	Meta    *models.SpeciesMeta `json:"meta"`
+}
+
+type ManySpeciesPayload struct {
+	Species *models.ManySpecies `json:"species"`
+	Strains *models.Strains     `json:"strains"`
+	Meta    *models.SpeciesMeta `json:"meta"`
+}
+
+func (s *SpeciesPayload) Marshal() ([]byte, error) {
+	return json.Marshal(s)
+}
+
+func (s *ManySpeciesPayload) Marshal() ([]byte, error) {
+	return json.Marshal(s)
+}
diff --git a/payloads/strains.go b/payloads/strains.go
new file mode 100644
index 0000000..bb0ec8d
--- /dev/null
+++ b/payloads/strains.go
@@ -0,0 +1,31 @@
+package payloads
+
+import (
+	"encoding/json"
+
+	"github.com/thermokarst/bactdb/models"
+)
+
+type StrainPayload struct {
+	Strain          *models.Strain          `json:"strain"`
+	Species         *models.ManySpecies     `json:"species"`
+	Characteristics *models.Characteristics `json:"characteristics"`
+	Measurements    *models.Measurements    `json:"measurements"`
+	Meta            *models.StrainMeta      `json:"meta"`
+}
+
+type StrainsPayload struct {
+	Strains         *models.Strains         `json:"strains"`
+	Species         *models.ManySpecies     `json:"species"`
+	Characteristics *models.Characteristics `json:"characteristics"`
+	Measurements    *models.Measurements    `json:"measurements"`
+	Meta            *models.StrainMeta      `json:"meta"`
+}
+
+func (s *StrainPayload) Marshal() ([]byte, error) {
+	return json.Marshal(s)
+}
+
+func (s *StrainsPayload) Marshal() ([]byte, error) {
+	return json.Marshal(s)
+}
diff --git a/payloads/users.go b/payloads/users.go
new file mode 100644
index 0000000..5329f25
--- /dev/null
+++ b/payloads/users.go
@@ -0,0 +1,16 @@
+package payloads
+
+import (
+	"encoding/json"
+
+	"github.com/thermokarst/bactdb/models"
+)
+
+type UserPayload struct {
+	User *models.User     `json:"user"`
+	Meta *models.UserMeta `json:"meta"`
+}
+
+func (u *UserPayload) Marshal() ([]byte, error) {
+	return json.Marshal(u)
+}