diff --git a/julia/MOLE.jl/src/BCs/BCs.jl b/julia/MOLE.jl/src/BCs/BCs.jl
new file mode 100644
index 00000000..0937a8ee
--- /dev/null
+++ b/julia/MOLE.jl/src/BCs/BCs.jl
@@ -0,0 +1,5 @@
+module BCs
+
+include("robinBC.jl")
+
+end # module BCs
\ No newline at end of file
diff --git a/julia/MOLE.jl/src/robinBC.jl b/julia/MOLE.jl/src/BCs/robinBC.jl
similarity index 100%
rename from julia/MOLE.jl/src/robinBC.jl
rename to julia/MOLE.jl/src/BCs/robinBC.jl
diff --git a/julia/MOLE.jl/src/MOLE.jl b/julia/MOLE.jl/src/MOLE.jl
index 2c20ae65..79224e03 100644
--- a/julia/MOLE.jl/src/MOLE.jl
+++ b/julia/MOLE.jl/src/MOLE.jl
@@ -6,11 +6,9 @@
 
 module MOLE
 
-include("divergence.jl")
-include("gradient.jl")
-include("laplacian.jl")
-include("robinBC.jl")
-
-export div, grad, lap, robinBC
+include("Operators/divergence.jl")
+include("Operators/gradient.jl")
+include("Operators/laplacian.jl")
+include("BCs/robinBC.jl")
 
 end # module MOLE
\ No newline at end of file
diff --git a/julia/MOLE.jl/src/Operators/Operators.jl b/julia/MOLE.jl/src/Operators/Operators.jl
new file mode 100644
index 00000000..20491d46
--- /dev/null
+++ b/julia/MOLE.jl/src/Operators/Operators.jl
@@ -0,0 +1,7 @@
+module Operators
+
+include("gradient.jl")
+include("divergence.jl")
+include("laplacian.jl")
+
+end # module Operators
\ No newline at end of file
diff --git a/julia/MOLE.jl/src/divergence.jl b/julia/MOLE.jl/src/Operators/divergence.jl
similarity index 100%
rename from julia/MOLE.jl/src/divergence.jl
rename to julia/MOLE.jl/src/Operators/divergence.jl
diff --git a/julia/MOLE.jl/src/gradient.jl b/julia/MOLE.jl/src/Operators/gradient.jl
similarity index 100%
rename from julia/MOLE.jl/src/gradient.jl
rename to julia/MOLE.jl/src/Operators/gradient.jl
diff --git a/julia/MOLE.jl/src/laplacian.jl b/julia/MOLE.jl/src/Operators/laplacian.jl
similarity index 100%
rename from julia/MOLE.jl/src/laplacian.jl
rename to julia/MOLE.jl/src/Operators/laplacian.jl
diff --git a/julia/MOLE.jl/test/testDivergence.jl b/julia/MOLE.jl/test/Operators/divergence.jl
similarity index 91%
rename from julia/MOLE.jl/test/testDivergence.jl
rename to julia/MOLE.jl/test/Operators/divergence.jl
index 9a0dd6d6..15d0bba2 100644
--- a/julia/MOLE.jl/test/testDivergence.jl
+++ b/julia/MOLE.jl/test/Operators/divergence.jl
@@ -1,6 +1,5 @@
-tol = 1e-10
-
 @testset "Testing divergence for order k=$k" for k=2:2:8
+    tol = 1e-10
     m = 2*k+1
     D = MOLE.div(k, m, 1/m)
     field = ones(m+1,1)
diff --git a/julia/MOLE.jl/test/testGradient.jl b/julia/MOLE.jl/test/Operators/gradient.jl
similarity index 100%
rename from julia/MOLE.jl/test/testGradient.jl
rename to julia/MOLE.jl/test/Operators/gradient.jl
diff --git a/julia/MOLE.jl/test/testLaplacian.jl b/julia/MOLE.jl/test/Operators/laplacian.jl
similarity index 100%
rename from julia/MOLE.jl/test/testLaplacian.jl
rename to julia/MOLE.jl/test/Operators/laplacian.jl
diff --git a/julia/MOLE.jl/test/runtests.jl b/julia/MOLE.jl/test/runtests.jl
index 86b8000a..745b3ff1 100644
--- a/julia/MOLE.jl/test/runtests.jl
+++ b/julia/MOLE.jl/test/runtests.jl
@@ -1,26 +1,16 @@
 using MOLE
 using Test, LinearAlgebra
 
-#tol = 1e-10
-
 @testset "Testing MOLE operators" begin
     @testset "Testing 1D divergence" begin
-        include("testDivergence.jl")
+        include("Operators/divergence.jl")
     end
 
     @testset "Testing 1D gradient" begin
-        include("testGradient.jl")
+        include("Operators/gradient.jl")
     end
 
     @testset "Testing 1D laplacian" begin
-        include("testLaplacian.jl")
+        include("Operators/laplacian.jl")
     end
-end
-
-# @testset "Testing Divergence for order k=$k" for k=2:2:8
-#     m = 2*k+1
-#     D = div(k, m, 1/m)
-#     field = ones(m+1,1)
-#     sol = D*field
-#     @test norm(sol) < tol
-# end
\ No newline at end of file
+end
\ No newline at end of file