diff --git a/src/nf.f90 b/src/nf.f90
index 474127bf..bcd783e3 100644
--- a/src/nf.f90
+++ b/src/nf.f90
@@ -1,4 +1,5 @@
 module nf
+  !! User API: everything an application needs to reference directly
   use nf_datasets_mnist, only: label_digits, load_mnist
   use nf_layer, only: layer
   use nf_layer_constructors, only: conv2d, dense, input, maxpool2d
diff --git a/src/nf_activation.f90 b/src/nf/nf_activation.f90
similarity index 100%
rename from src/nf_activation.f90
rename to src/nf/nf_activation.f90
diff --git a/src/nf_base_layer.f90 b/src/nf/nf_base_layer.f90
similarity index 100%
rename from src/nf_base_layer.f90
rename to src/nf/nf_base_layer.f90
diff --git a/src/nf_base_layer_submodule.f90 b/src/nf/nf_base_layer_submodule.f90
similarity index 100%
rename from src/nf_base_layer_submodule.f90
rename to src/nf/nf_base_layer_submodule.f90
diff --git a/src/nf_conv2d_layer.f90 b/src/nf/nf_conv2d_layer.f90
similarity index 100%
rename from src/nf_conv2d_layer.f90
rename to src/nf/nf_conv2d_layer.f90
diff --git a/src/nf_conv2d_layer_submodule.f90 b/src/nf/nf_conv2d_layer_submodule.f90
similarity index 100%
rename from src/nf_conv2d_layer_submodule.f90
rename to src/nf/nf_conv2d_layer_submodule.f90
diff --git a/src/nf_datasets_mnist.f90 b/src/nf/nf_datasets_mnist.f90
similarity index 100%
rename from src/nf_datasets_mnist.f90
rename to src/nf/nf_datasets_mnist.f90
diff --git a/src/nf_datasets_mnist_submodule.f90 b/src/nf/nf_datasets_mnist_submodule.f90
similarity index 100%
rename from src/nf_datasets_mnist_submodule.f90
rename to src/nf/nf_datasets_mnist_submodule.f90
diff --git a/src/nf_dense_layer.f90 b/src/nf/nf_dense_layer.f90
similarity index 100%
rename from src/nf_dense_layer.f90
rename to src/nf/nf_dense_layer.f90
diff --git a/src/nf_dense_layer_submodule.f90 b/src/nf/nf_dense_layer_submodule.f90
similarity index 100%
rename from src/nf_dense_layer_submodule.f90
rename to src/nf/nf_dense_layer_submodule.f90
diff --git a/src/nf_input1d_layer.f90 b/src/nf/nf_input1d_layer.f90
similarity index 100%
rename from src/nf_input1d_layer.f90
rename to src/nf/nf_input1d_layer.f90
diff --git a/src/nf_input1d_layer_submodule.f90 b/src/nf/nf_input1d_layer_submodule.f90
similarity index 100%
rename from src/nf_input1d_layer_submodule.f90
rename to src/nf/nf_input1d_layer_submodule.f90
diff --git a/src/nf_input3d_layer.f90 b/src/nf/nf_input3d_layer.f90
similarity index 100%
rename from src/nf_input3d_layer.f90
rename to src/nf/nf_input3d_layer.f90
diff --git a/src/nf_input3d_layer_submodule.f90 b/src/nf/nf_input3d_layer_submodule.f90
similarity index 100%
rename from src/nf_input3d_layer_submodule.f90
rename to src/nf/nf_input3d_layer_submodule.f90
diff --git a/src/nf_io.f90 b/src/nf/nf_io.f90
similarity index 100%
rename from src/nf_io.f90
rename to src/nf/nf_io.f90
diff --git a/src/nf_io_submodule.f90 b/src/nf/nf_io_submodule.f90
similarity index 100%
rename from src/nf_io_submodule.f90
rename to src/nf/nf_io_submodule.f90
diff --git a/src/nf_layer.f90 b/src/nf/nf_layer.f90
similarity index 100%
rename from src/nf_layer.f90
rename to src/nf/nf_layer.f90
diff --git a/src/nf_layer_constructors.f90 b/src/nf/nf_layer_constructors.f90
similarity index 100%
rename from src/nf_layer_constructors.f90
rename to src/nf/nf_layer_constructors.f90
diff --git a/src/nf_layer_constructors_submodule.f90 b/src/nf/nf_layer_constructors_submodule.f90
similarity index 100%
rename from src/nf_layer_constructors_submodule.f90
rename to src/nf/nf_layer_constructors_submodule.f90
diff --git a/src/nf_layer_submodule.f90 b/src/nf/nf_layer_submodule.f90
similarity index 100%
rename from src/nf_layer_submodule.f90
rename to src/nf/nf_layer_submodule.f90
diff --git a/src/nf_loss.f90 b/src/nf/nf_loss.f90
similarity index 100%
rename from src/nf_loss.f90
rename to src/nf/nf_loss.f90
diff --git a/src/nf_loss_submodule.f90 b/src/nf/nf_loss_submodule.f90
similarity index 100%
rename from src/nf_loss_submodule.f90
rename to src/nf/nf_loss_submodule.f90
diff --git a/src/nf_maxpool2d_layer.f90 b/src/nf/nf_maxpool2d_layer.f90
similarity index 100%
rename from src/nf_maxpool2d_layer.f90
rename to src/nf/nf_maxpool2d_layer.f90
diff --git a/src/nf_maxpool2d_layer_submodule.f90 b/src/nf/nf_maxpool2d_layer_submodule.f90
similarity index 100%
rename from src/nf_maxpool2d_layer_submodule.f90
rename to src/nf/nf_maxpool2d_layer_submodule.f90
diff --git a/src/nf_network.f90 b/src/nf/nf_network.f90
similarity index 100%
rename from src/nf_network.f90
rename to src/nf/nf_network.f90
diff --git a/src/nf_network_submodule.f90 b/src/nf/nf_network_submodule.f90
similarity index 100%
rename from src/nf_network_submodule.f90
rename to src/nf/nf_network_submodule.f90
diff --git a/src/nf_optimizers.f90 b/src/nf/nf_optimizers.f90
similarity index 100%
rename from src/nf_optimizers.f90
rename to src/nf/nf_optimizers.f90
diff --git a/src/nf_parallel.f90 b/src/nf/nf_parallel.f90
similarity index 100%
rename from src/nf_parallel.f90
rename to src/nf/nf_parallel.f90
diff --git a/src/nf_parallel_submodule.f90 b/src/nf/nf_parallel_submodule.f90
similarity index 100%
rename from src/nf_parallel_submodule.f90
rename to src/nf/nf_parallel_submodule.f90
diff --git a/src/nf_random.f90 b/src/nf/nf_random.f90
similarity index 100%
rename from src/nf_random.f90
rename to src/nf/nf_random.f90
diff --git a/src/nf_random_submodule.f90 b/src/nf/nf_random_submodule.f90
similarity index 100%
rename from src/nf_random_submodule.f90
rename to src/nf/nf_random_submodule.f90