diff --git a/SConstructGDNative b/SConstructGDNative
index 05bb11c..2b037b5 100644
--- a/SConstructGDNative
+++ b/SConstructGDNative
@@ -90,10 +90,10 @@ env.Append(CCFLAGS = ['-DGDNATIVE'])
 sources = [
     "gdlibrary.cpp",
 
-    "mlpp/lin_alg/mlpp_vector.cpp",
-    "mlpp/lin_alg/mlpp_matrix.cpp",
-    "mlpp/lin_alg/mlpp_tensor3.cpp",
-    "mlpp/lin_alg/lin_alg.cpp",
+    "lin_alg/mlpp_vector.cpp",
+    "lin_alg/mlpp_matrix.cpp",
+    "lin_alg/mlpp_tensor3.cpp",
+    "lin_alg/lin_alg.cpp",
 
 ]
 
diff --git a/SCsub b/SCsub
index 4640c0e..959b6df 100644
--- a/SCsub
+++ b/SCsub
@@ -12,49 +12,49 @@ if ARGUMENTS.get('pmlpp_build_tests', 'yes') == 'no':
 sources = [
     "register_types.cpp",
 
-    "mlpp/lin_alg/mlpp_vector.cpp",
-    "mlpp/lin_alg/mlpp_matrix.cpp",
-    "mlpp/lin_alg/mlpp_tensor3.cpp",
+    "lin_alg/mlpp_vector.cpp",
+    "lin_alg/mlpp_matrix.cpp",
+    "lin_alg/mlpp_tensor3.cpp",
 
-    "mlpp/activation/activation.cpp",
-    "mlpp/ann/ann.cpp",
-    "mlpp/auto_encoder/auto_encoder.cpp",
-    "mlpp/bernoulli_nb/bernoulli_nb.cpp",
-    "mlpp/c_log_log_reg/c_log_log_reg.cpp",
-    "mlpp/convolutions/convolutions.cpp",
-    "mlpp/cost/cost.cpp",
-    "mlpp/data/data.cpp",
-    "mlpp/dual_svc/dual_svc.cpp",
-    "mlpp/exp_reg/exp_reg.cpp",
-    "mlpp/gan/gan.cpp",
-    "mlpp/gaussian_nb/gaussian_nb.cpp",
-    "mlpp/gauss_markov_checker/gauss_markov_checker.cpp",
-    "mlpp/hidden_layer/hidden_layer.cpp",
-    "mlpp/hypothesis_testing/hypothesis_testing.cpp",
-    "mlpp/kmeans/kmeans.cpp",
-    "mlpp/knn/knn.cpp",
-    "mlpp/lin_alg/lin_alg.cpp",
-    "mlpp/lin_reg/lin_reg.cpp",
-    "mlpp/log_reg/log_reg.cpp",
-    "mlpp/mann/mann.cpp",
-    "mlpp/mlp/mlp.cpp",
-    "mlpp/multinomial_nb/multinomial_nb.cpp",
-    "mlpp/multi_output_layer/multi_output_layer.cpp",
-    "mlpp/numerical_analysis/numerical_analysis.cpp",
-    "mlpp/outlier_finder/outlier_finder.cpp",
-    "mlpp/output_layer/output_layer.cpp",
-    "mlpp/pca/pca.cpp",
-    "mlpp/probit_reg/probit_reg.cpp",
-    "mlpp/regularization/reg.cpp",
-    "mlpp/softmax_net/softmax_net.cpp",
-    "mlpp/softmax_reg/softmax_reg.cpp",
-    "mlpp/stat/stat.cpp",
-    "mlpp/svc/svc.cpp",
-    "mlpp/tanh_reg/tanh_reg.cpp",
-    "mlpp/transforms/transforms.cpp",
-    "mlpp/uni_lin_reg/uni_lin_reg.cpp",
-    "mlpp/utilities/utilities.cpp",
-    "mlpp/wgan/wgan.cpp",
+    "activation/activation.cpp",
+    "ann/ann.cpp",
+    "auto_encoder/auto_encoder.cpp",
+    "bernoulli_nb/bernoulli_nb.cpp",
+    "c_log_log_reg/c_log_log_reg.cpp",
+    "convolutions/convolutions.cpp",
+    "cost/cost.cpp",
+    "data/data.cpp",
+    "dual_svc/dual_svc.cpp",
+    "exp_reg/exp_reg.cpp",
+    "gan/gan.cpp",
+    "gaussian_nb/gaussian_nb.cpp",
+    "gauss_markov_checker/gauss_markov_checker.cpp",
+    "hidden_layer/hidden_layer.cpp",
+    "hypothesis_testing/hypothesis_testing.cpp",
+    "kmeans/kmeans.cpp",
+    "knn/knn.cpp",
+    "lin_alg/lin_alg.cpp",
+    "lin_reg/lin_reg.cpp",
+    "log_reg/log_reg.cpp",
+    "mann/mann.cpp",
+    "mlp/mlp.cpp",
+    "multinomial_nb/multinomial_nb.cpp",
+    "multi_output_layer/multi_output_layer.cpp",
+    "numerical_analysis/numerical_analysis.cpp",
+    "outlier_finder/outlier_finder.cpp",
+    "output_layer/output_layer.cpp",
+    "pca/pca.cpp",
+    "probit_reg/probit_reg.cpp",
+    "regularization/reg.cpp",
+    "softmax_net/softmax_net.cpp",
+    "softmax_reg/softmax_reg.cpp",
+    "stat/stat.cpp",
+    "svc/svc.cpp",
+    "tanh_reg/tanh_reg.cpp",
+    "transforms/transforms.cpp",
+    "uni_lin_reg/uni_lin_reg.cpp",
+    "utilities/utilities.cpp",
+    "wgan/wgan.cpp",
 ]
 
 if module_env.pmlpp_build_tests:
diff --git a/mlpp/activation/activation.cpp b/activation/activation.cpp
similarity index 100%
rename from mlpp/activation/activation.cpp
rename to activation/activation.cpp
diff --git a/mlpp/activation/activation.h b/activation/activation.h
similarity index 100%
rename from mlpp/activation/activation.h
rename to activation/activation.h
diff --git a/mlpp/ann/ann.cpp b/ann/ann.cpp
similarity index 100%
rename from mlpp/ann/ann.cpp
rename to ann/ann.cpp
diff --git a/mlpp/ann/ann.h b/ann/ann.h
similarity index 100%
rename from mlpp/ann/ann.h
rename to ann/ann.h
diff --git a/mlpp/auto_encoder/auto_encoder.cpp b/auto_encoder/auto_encoder.cpp
similarity index 100%
rename from mlpp/auto_encoder/auto_encoder.cpp
rename to auto_encoder/auto_encoder.cpp
diff --git a/mlpp/auto_encoder/auto_encoder.h b/auto_encoder/auto_encoder.h
similarity index 100%
rename from mlpp/auto_encoder/auto_encoder.h
rename to auto_encoder/auto_encoder.h
diff --git a/mlpp/bernoulli_nb/bernoulli_nb.cpp b/bernoulli_nb/bernoulli_nb.cpp
similarity index 100%
rename from mlpp/bernoulli_nb/bernoulli_nb.cpp
rename to bernoulli_nb/bernoulli_nb.cpp
diff --git a/mlpp/bernoulli_nb/bernoulli_nb.h b/bernoulli_nb/bernoulli_nb.h
similarity index 100%
rename from mlpp/bernoulli_nb/bernoulli_nb.h
rename to bernoulli_nb/bernoulli_nb.h
diff --git a/mlpp/c_log_log_reg/c_log_log_reg.cpp b/c_log_log_reg/c_log_log_reg.cpp
similarity index 100%
rename from mlpp/c_log_log_reg/c_log_log_reg.cpp
rename to c_log_log_reg/c_log_log_reg.cpp
diff --git a/mlpp/c_log_log_reg/c_log_log_reg.h b/c_log_log_reg/c_log_log_reg.h
similarity index 100%
rename from mlpp/c_log_log_reg/c_log_log_reg.h
rename to c_log_log_reg/c_log_log_reg.h
diff --git a/mlpp/convolutions/convolutions.cpp b/convolutions/convolutions.cpp
similarity index 100%
rename from mlpp/convolutions/convolutions.cpp
rename to convolutions/convolutions.cpp
diff --git a/mlpp/convolutions/convolutions.h b/convolutions/convolutions.h
similarity index 100%
rename from mlpp/convolutions/convolutions.h
rename to convolutions/convolutions.h
diff --git a/mlpp/cost/cost.cpp b/cost/cost.cpp
similarity index 100%
rename from mlpp/cost/cost.cpp
rename to cost/cost.cpp
diff --git a/mlpp/cost/cost.h b/cost/cost.h
similarity index 100%
rename from mlpp/cost/cost.h
rename to cost/cost.h
diff --git a/mlpp/data/data.cpp b/data/data.cpp
similarity index 100%
rename from mlpp/data/data.cpp
rename to data/data.cpp
diff --git a/mlpp/data/data.h b/data/data.h
similarity index 100%
rename from mlpp/data/data.h
rename to data/data.h
diff --git a/mlpp/dual_svc/dual_svc.cpp b/dual_svc/dual_svc.cpp
similarity index 100%
rename from mlpp/dual_svc/dual_svc.cpp
rename to dual_svc/dual_svc.cpp
diff --git a/mlpp/dual_svc/dual_svc.h b/dual_svc/dual_svc.h
similarity index 100%
rename from mlpp/dual_svc/dual_svc.h
rename to dual_svc/dual_svc.h
diff --git a/mlpp/exp_reg/exp_reg.cpp b/exp_reg/exp_reg.cpp
similarity index 100%
rename from mlpp/exp_reg/exp_reg.cpp
rename to exp_reg/exp_reg.cpp
diff --git a/mlpp/exp_reg/exp_reg.h b/exp_reg/exp_reg.h
similarity index 100%
rename from mlpp/exp_reg/exp_reg.h
rename to exp_reg/exp_reg.h
diff --git a/mlpp/gan/gan.cpp b/gan/gan.cpp
similarity index 100%
rename from mlpp/gan/gan.cpp
rename to gan/gan.cpp
diff --git a/mlpp/gan/gan.h b/gan/gan.h
similarity index 100%
rename from mlpp/gan/gan.h
rename to gan/gan.h
diff --git a/mlpp/gauss_markov_checker/gauss_markov_checker.cpp b/gauss_markov_checker/gauss_markov_checker.cpp
similarity index 100%
rename from mlpp/gauss_markov_checker/gauss_markov_checker.cpp
rename to gauss_markov_checker/gauss_markov_checker.cpp
diff --git a/mlpp/gauss_markov_checker/gauss_markov_checker.h b/gauss_markov_checker/gauss_markov_checker.h
similarity index 100%
rename from mlpp/gauss_markov_checker/gauss_markov_checker.h
rename to gauss_markov_checker/gauss_markov_checker.h
diff --git a/mlpp/gaussian_nb/gaussian_nb.cpp b/gaussian_nb/gaussian_nb.cpp
similarity index 100%
rename from mlpp/gaussian_nb/gaussian_nb.cpp
rename to gaussian_nb/gaussian_nb.cpp
diff --git a/mlpp/gaussian_nb/gaussian_nb.h b/gaussian_nb/gaussian_nb.h
similarity index 100%
rename from mlpp/gaussian_nb/gaussian_nb.h
rename to gaussian_nb/gaussian_nb.h
diff --git a/mlpp/hidden_layer/hidden_layer.cpp b/hidden_layer/hidden_layer.cpp
similarity index 100%
rename from mlpp/hidden_layer/hidden_layer.cpp
rename to hidden_layer/hidden_layer.cpp
diff --git a/mlpp/hidden_layer/hidden_layer.h b/hidden_layer/hidden_layer.h
similarity index 100%
rename from mlpp/hidden_layer/hidden_layer.h
rename to hidden_layer/hidden_layer.h
diff --git a/mlpp/hypothesis_testing/hypothesis_testing.cpp b/hypothesis_testing/hypothesis_testing.cpp
similarity index 100%
rename from mlpp/hypothesis_testing/hypothesis_testing.cpp
rename to hypothesis_testing/hypothesis_testing.cpp
diff --git a/mlpp/hypothesis_testing/hypothesis_testing.h b/hypothesis_testing/hypothesis_testing.h
similarity index 100%
rename from mlpp/hypothesis_testing/hypothesis_testing.h
rename to hypothesis_testing/hypothesis_testing.h
diff --git a/mlpp/kmeans/kmeans.cpp b/kmeans/kmeans.cpp
similarity index 100%
rename from mlpp/kmeans/kmeans.cpp
rename to kmeans/kmeans.cpp
diff --git a/mlpp/kmeans/kmeans.h b/kmeans/kmeans.h
similarity index 100%
rename from mlpp/kmeans/kmeans.h
rename to kmeans/kmeans.h
diff --git a/mlpp/knn/knn.cpp b/knn/knn.cpp
similarity index 100%
rename from mlpp/knn/knn.cpp
rename to knn/knn.cpp
diff --git a/mlpp/knn/knn.h b/knn/knn.h
similarity index 100%
rename from mlpp/knn/knn.h
rename to knn/knn.h
diff --git a/mlpp/lin_alg/lin_alg.cpp b/lin_alg/lin_alg.cpp
similarity index 100%
rename from mlpp/lin_alg/lin_alg.cpp
rename to lin_alg/lin_alg.cpp
diff --git a/mlpp/lin_alg/lin_alg.h b/lin_alg/lin_alg.h
similarity index 100%
rename from mlpp/lin_alg/lin_alg.h
rename to lin_alg/lin_alg.h
diff --git a/mlpp/lin_alg/mlpp_matrix.cpp b/lin_alg/mlpp_matrix.cpp
similarity index 100%
rename from mlpp/lin_alg/mlpp_matrix.cpp
rename to lin_alg/mlpp_matrix.cpp
diff --git a/mlpp/lin_alg/mlpp_matrix.h b/lin_alg/mlpp_matrix.h
similarity index 100%
rename from mlpp/lin_alg/mlpp_matrix.h
rename to lin_alg/mlpp_matrix.h
diff --git a/mlpp/lin_alg/mlpp_tensor3.cpp b/lin_alg/mlpp_tensor3.cpp
similarity index 100%
rename from mlpp/lin_alg/mlpp_tensor3.cpp
rename to lin_alg/mlpp_tensor3.cpp
diff --git a/mlpp/lin_alg/mlpp_tensor3.h b/lin_alg/mlpp_tensor3.h
similarity index 100%
rename from mlpp/lin_alg/mlpp_tensor3.h
rename to lin_alg/mlpp_tensor3.h
diff --git a/mlpp/lin_alg/mlpp_vector.cpp b/lin_alg/mlpp_vector.cpp
similarity index 100%
rename from mlpp/lin_alg/mlpp_vector.cpp
rename to lin_alg/mlpp_vector.cpp
diff --git a/mlpp/lin_alg/mlpp_vector.h b/lin_alg/mlpp_vector.h
similarity index 100%
rename from mlpp/lin_alg/mlpp_vector.h
rename to lin_alg/mlpp_vector.h
diff --git a/mlpp/lin_reg/lin_reg.cpp b/lin_reg/lin_reg.cpp
similarity index 100%
rename from mlpp/lin_reg/lin_reg.cpp
rename to lin_reg/lin_reg.cpp
diff --git a/mlpp/lin_reg/lin_reg.h b/lin_reg/lin_reg.h
similarity index 100%
rename from mlpp/lin_reg/lin_reg.h
rename to lin_reg/lin_reg.h
diff --git a/mlpp/log_reg/log_reg.cpp b/log_reg/log_reg.cpp
similarity index 100%
rename from mlpp/log_reg/log_reg.cpp
rename to log_reg/log_reg.cpp
diff --git a/mlpp/log_reg/log_reg.h b/log_reg/log_reg.h
similarity index 100%
rename from mlpp/log_reg/log_reg.h
rename to log_reg/log_reg.h
diff --git a/mlpp/mann/mann.cpp b/mann/mann.cpp
similarity index 100%
rename from mlpp/mann/mann.cpp
rename to mann/mann.cpp
diff --git a/mlpp/mann/mann.h b/mann/mann.h
similarity index 100%
rename from mlpp/mann/mann.h
rename to mann/mann.h
diff --git a/mlpp/mlp/mlp.cpp b/mlp/mlp.cpp
similarity index 100%
rename from mlpp/mlp/mlp.cpp
rename to mlp/mlp.cpp
diff --git a/mlpp/mlp/mlp.h b/mlp/mlp.h
similarity index 100%
rename from mlpp/mlp/mlp.h
rename to mlp/mlp.h
diff --git a/mlpp/multi_output_layer/multi_output_layer.cpp b/multi_output_layer/multi_output_layer.cpp
similarity index 100%
rename from mlpp/multi_output_layer/multi_output_layer.cpp
rename to multi_output_layer/multi_output_layer.cpp
diff --git a/mlpp/multi_output_layer/multi_output_layer.h b/multi_output_layer/multi_output_layer.h
similarity index 100%
rename from mlpp/multi_output_layer/multi_output_layer.h
rename to multi_output_layer/multi_output_layer.h
diff --git a/mlpp/multinomial_nb/multinomial_nb.cpp b/multinomial_nb/multinomial_nb.cpp
similarity index 100%
rename from mlpp/multinomial_nb/multinomial_nb.cpp
rename to multinomial_nb/multinomial_nb.cpp
diff --git a/mlpp/multinomial_nb/multinomial_nb.h b/multinomial_nb/multinomial_nb.h
similarity index 100%
rename from mlpp/multinomial_nb/multinomial_nb.h
rename to multinomial_nb/multinomial_nb.h
diff --git a/mlpp/numerical_analysis/numerical_analysis.cpp b/numerical_analysis/numerical_analysis.cpp
similarity index 100%
rename from mlpp/numerical_analysis/numerical_analysis.cpp
rename to numerical_analysis/numerical_analysis.cpp
diff --git a/mlpp/numerical_analysis/numerical_analysis.h b/numerical_analysis/numerical_analysis.h
similarity index 100%
rename from mlpp/numerical_analysis/numerical_analysis.h
rename to numerical_analysis/numerical_analysis.h
diff --git a/mlpp/outlier_finder/outlier_finder.cpp b/outlier_finder/outlier_finder.cpp
similarity index 100%
rename from mlpp/outlier_finder/outlier_finder.cpp
rename to outlier_finder/outlier_finder.cpp
diff --git a/mlpp/outlier_finder/outlier_finder.h b/outlier_finder/outlier_finder.h
similarity index 100%
rename from mlpp/outlier_finder/outlier_finder.h
rename to outlier_finder/outlier_finder.h
diff --git a/mlpp/output_layer/output_layer.cpp b/output_layer/output_layer.cpp
similarity index 100%
rename from mlpp/output_layer/output_layer.cpp
rename to output_layer/output_layer.cpp
diff --git a/mlpp/output_layer/output_layer.h b/output_layer/output_layer.h
similarity index 100%
rename from mlpp/output_layer/output_layer.h
rename to output_layer/output_layer.h
diff --git a/mlpp/pca/pca.cpp b/pca/pca.cpp
similarity index 100%
rename from mlpp/pca/pca.cpp
rename to pca/pca.cpp
diff --git a/mlpp/pca/pca.h b/pca/pca.h
similarity index 100%
rename from mlpp/pca/pca.h
rename to pca/pca.h
diff --git a/mlpp/probit_reg/probit_reg.cpp b/probit_reg/probit_reg.cpp
similarity index 100%
rename from mlpp/probit_reg/probit_reg.cpp
rename to probit_reg/probit_reg.cpp
diff --git a/mlpp/probit_reg/probit_reg.h b/probit_reg/probit_reg.h
similarity index 100%
rename from mlpp/probit_reg/probit_reg.h
rename to probit_reg/probit_reg.h
diff --git a/register_types.cpp b/register_types.cpp
index a5a8a0d..2b3f823 100644
--- a/register_types.cpp
+++ b/register_types.cpp
@@ -30,51 +30,51 @@
 
 #include "register_types.h"
 
-#include "mlpp/data/data.h"
-#include "mlpp/lin_alg/mlpp_matrix.h"
-#include "mlpp/lin_alg/mlpp_tensor3.h"
-#include "mlpp/lin_alg/mlpp_vector.h"
+#include "data/data.h"
+#include "lin_alg/mlpp_matrix.h"
+#include "lin_alg/mlpp_tensor3.h"
+#include "lin_alg/mlpp_vector.h"
 
-#include "mlpp/activation/activation.h"
-#include "mlpp/convolutions/convolutions.h"
-#include "mlpp/cost/cost.h"
-#include "mlpp/gauss_markov_checker/gauss_markov_checker.h"
-#include "mlpp/hypothesis_testing/hypothesis_testing.h"
-#include "mlpp/lin_alg/lin_alg.h"
-#include "mlpp/numerical_analysis/numerical_analysis.h"
-#include "mlpp/regularization/reg.h"
-#include "mlpp/stat/stat.h"
-#include "mlpp/transforms/transforms.h"
-#include "mlpp/utilities/utilities.h"
+#include "activation/activation.h"
+#include "convolutions/convolutions.h"
+#include "cost/cost.h"
+#include "gauss_markov_checker/gauss_markov_checker.h"
+#include "hypothesis_testing/hypothesis_testing.h"
+#include "lin_alg/lin_alg.h"
+#include "numerical_analysis/numerical_analysis.h"
+#include "regularization/reg.h"
+#include "stat/stat.h"
+#include "transforms/transforms.h"
+#include "utilities/utilities.h"
 
-#include "mlpp/hidden_layer/hidden_layer.h"
-#include "mlpp/multi_output_layer/multi_output_layer.h"
-#include "mlpp/output_layer/output_layer.h"
+#include "hidden_layer/hidden_layer.h"
+#include "multi_output_layer/multi_output_layer.h"
+#include "output_layer/output_layer.h"
 
-#include "mlpp/ann/ann.h"
-#include "mlpp/auto_encoder/auto_encoder.h"
-#include "mlpp/bernoulli_nb/bernoulli_nb.h"
-#include "mlpp/c_log_log_reg/c_log_log_reg.h"
-#include "mlpp/dual_svc/dual_svc.h"
-#include "mlpp/exp_reg/exp_reg.h"
-#include "mlpp/gan/gan.h"
-#include "mlpp/gaussian_nb/gaussian_nb.h"
-#include "mlpp/kmeans/kmeans.h"
-#include "mlpp/knn/knn.h"
-#include "mlpp/lin_reg/lin_reg.h"
-#include "mlpp/log_reg/log_reg.h"
-#include "mlpp/mann/mann.h"
-#include "mlpp/mlp/mlp.h"
-#include "mlpp/multinomial_nb/multinomial_nb.h"
-#include "mlpp/outlier_finder/outlier_finder.h"
-#include "mlpp/pca/pca.h"
-#include "mlpp/probit_reg/probit_reg.h"
-#include "mlpp/softmax_net/softmax_net.h"
-#include "mlpp/softmax_reg/softmax_reg.h"
-#include "mlpp/svc/svc.h"
-#include "mlpp/tanh_reg/tanh_reg.h"
-#include "mlpp/uni_lin_reg/uni_lin_reg.h"
-#include "mlpp/wgan/wgan.h"
+#include "ann/ann.h"
+#include "auto_encoder/auto_encoder.h"
+#include "bernoulli_nb/bernoulli_nb.h"
+#include "c_log_log_reg/c_log_log_reg.h"
+#include "dual_svc/dual_svc.h"
+#include "exp_reg/exp_reg.h"
+#include "gan/gan.h"
+#include "gaussian_nb/gaussian_nb.h"
+#include "kmeans/kmeans.h"
+#include "knn/knn.h"
+#include "lin_reg/lin_reg.h"
+#include "log_reg/log_reg.h"
+#include "mann/mann.h"
+#include "mlp/mlp.h"
+#include "multinomial_nb/multinomial_nb.h"
+#include "outlier_finder/outlier_finder.h"
+#include "pca/pca.h"
+#include "probit_reg/probit_reg.h"
+#include "softmax_net/softmax_net.h"
+#include "softmax_reg/softmax_reg.h"
+#include "svc/svc.h"
+#include "tanh_reg/tanh_reg.h"
+#include "uni_lin_reg/uni_lin_reg.h"
+#include "wgan/wgan.h"
 
 #ifdef TESTS_ENABLED
 #include "test/mlpp_matrix_tests.h"
diff --git a/mlpp/regularization/reg.cpp b/regularization/reg.cpp
similarity index 100%
rename from mlpp/regularization/reg.cpp
rename to regularization/reg.cpp
diff --git a/mlpp/regularization/reg.h b/regularization/reg.h
similarity index 100%
rename from mlpp/regularization/reg.h
rename to regularization/reg.h
diff --git a/mlpp/softmax_net/softmax_net.cpp b/softmax_net/softmax_net.cpp
similarity index 100%
rename from mlpp/softmax_net/softmax_net.cpp
rename to softmax_net/softmax_net.cpp
diff --git a/mlpp/softmax_net/softmax_net.h b/softmax_net/softmax_net.h
similarity index 100%
rename from mlpp/softmax_net/softmax_net.h
rename to softmax_net/softmax_net.h
diff --git a/mlpp/softmax_reg/softmax_reg.cpp b/softmax_reg/softmax_reg.cpp
similarity index 100%
rename from mlpp/softmax_reg/softmax_reg.cpp
rename to softmax_reg/softmax_reg.cpp
diff --git a/mlpp/softmax_reg/softmax_reg.h b/softmax_reg/softmax_reg.h
similarity index 100%
rename from mlpp/softmax_reg/softmax_reg.h
rename to softmax_reg/softmax_reg.h
diff --git a/mlpp/stat/stat.cpp b/stat/stat.cpp
similarity index 100%
rename from mlpp/stat/stat.cpp
rename to stat/stat.cpp
diff --git a/mlpp/stat/stat.h b/stat/stat.h
similarity index 100%
rename from mlpp/stat/stat.h
rename to stat/stat.h
diff --git a/mlpp/svc/svc.cpp b/svc/svc.cpp
similarity index 100%
rename from mlpp/svc/svc.cpp
rename to svc/svc.cpp
diff --git a/mlpp/svc/svc.h b/svc/svc.h
similarity index 100%
rename from mlpp/svc/svc.h
rename to svc/svc.h
diff --git a/mlpp/tanh_reg/tanh_reg.cpp b/tanh_reg/tanh_reg.cpp
similarity index 100%
rename from mlpp/tanh_reg/tanh_reg.cpp
rename to tanh_reg/tanh_reg.cpp
diff --git a/mlpp/tanh_reg/tanh_reg.h b/tanh_reg/tanh_reg.h
similarity index 100%
rename from mlpp/tanh_reg/tanh_reg.h
rename to tanh_reg/tanh_reg.h
diff --git a/test/mlpp_matrix_tests.cpp b/test/mlpp_matrix_tests.cpp
index 899a216..f21185b 100644
--- a/test/mlpp_matrix_tests.cpp
+++ b/test/mlpp_matrix_tests.cpp
@@ -32,7 +32,7 @@
 
 #include "core/log/logger.h"
 
-#include "../mlpp/lin_alg/mlpp_matrix.h"
+#include "../lin_alg/mlpp_matrix.h"
 
 void MLPPMatrixTests::run_tests() {
 	PLOG_MSG("RUNNIG MLPPMatrixTests!");
diff --git a/test/mlpp_tests.cpp b/test/mlpp_tests.cpp
index 37c99a4..f978913 100644
--- a/test/mlpp_tests.cpp
+++ b/test/mlpp_tests.cpp
@@ -40,41 +40,41 @@
 #include <iostream>
 #include <vector>
 
-#include "../mlpp/lin_alg/mlpp_matrix.h"
-#include "../mlpp/lin_alg/mlpp_vector.h"
+#include "../lin_alg/mlpp_matrix.h"
+#include "../lin_alg/mlpp_vector.h"
 
-#include "../mlpp/activation/activation.h"
-#include "../mlpp/ann/ann.h"
-#include "../mlpp/auto_encoder/auto_encoder.h"
-#include "../mlpp/bernoulli_nb/bernoulli_nb.h"
-#include "../mlpp/c_log_log_reg/c_log_log_reg.h"
-#include "../mlpp/convolutions/convolutions.h"
-#include "../mlpp/cost/cost.h"
-#include "../mlpp/data/data.h"
-#include "../mlpp/dual_svc/dual_svc.h"
-#include "../mlpp/exp_reg/exp_reg.h"
-#include "../mlpp/gan/gan.h"
-#include "../mlpp/gaussian_nb/gaussian_nb.h"
-#include "../mlpp/kmeans/kmeans.h"
-#include "../mlpp/knn/knn.h"
-#include "../mlpp/lin_alg/lin_alg.h"
-#include "../mlpp/lin_reg/lin_reg.h"
-#include "../mlpp/log_reg/log_reg.h"
-#include "../mlpp/mann/mann.h"
-#include "../mlpp/mlp/mlp.h"
-#include "../mlpp/multinomial_nb/multinomial_nb.h"
-#include "../mlpp/numerical_analysis/numerical_analysis.h"
-#include "../mlpp/outlier_finder/outlier_finder.h"
-#include "../mlpp/pca/pca.h"
-#include "../mlpp/probit_reg/probit_reg.h"
-#include "../mlpp/softmax_net/softmax_net.h"
-#include "../mlpp/softmax_reg/softmax_reg.h"
-#include "../mlpp/stat/stat.h"
-#include "../mlpp/svc/svc.h"
-#include "../mlpp/tanh_reg/tanh_reg.h"
-#include "../mlpp/transforms/transforms.h"
-#include "../mlpp/uni_lin_reg/uni_lin_reg.h"
-#include "../mlpp/wgan/wgan.h"
+#include "../activation/activation.h"
+#include "../ann/ann.h"
+#include "../auto_encoder/auto_encoder.h"
+#include "../bernoulli_nb/bernoulli_nb.h"
+#include "../c_log_log_reg/c_log_log_reg.h"
+#include "../convolutions/convolutions.h"
+#include "../cost/cost.h"
+#include "../data/data.h"
+#include "../dual_svc/dual_svc.h"
+#include "../exp_reg/exp_reg.h"
+#include "../gan/gan.h"
+#include "../gaussian_nb/gaussian_nb.h"
+#include "../kmeans/kmeans.h"
+#include "../knn/knn.h"
+#include "../lin_alg/lin_alg.h"
+#include "../lin_reg/lin_reg.h"
+#include "../log_reg/log_reg.h"
+#include "../mann/mann.h"
+#include "../mlp/mlp.h"
+#include "../multinomial_nb/multinomial_nb.h"
+#include "../numerical_analysis/numerical_analysis.h"
+#include "../outlier_finder/outlier_finder.h"
+#include "../pca/pca.h"
+#include "../probit_reg/probit_reg.h"
+#include "../softmax_net/softmax_net.h"
+#include "../softmax_reg/softmax_reg.h"
+#include "../stat/stat.h"
+#include "../svc/svc.h"
+#include "../tanh_reg/tanh_reg.h"
+#include "../transforms/transforms.h"
+#include "../uni_lin_reg/uni_lin_reg.h"
+#include "../wgan/wgan.h"
 
 Vector<real_t> dstd_vec_to_vec(const std::vector<real_t> &in) {
 	Vector<real_t> r;
diff --git a/mlpp/transforms/transforms.cpp b/transforms/transforms.cpp
similarity index 100%
rename from mlpp/transforms/transforms.cpp
rename to transforms/transforms.cpp
diff --git a/mlpp/transforms/transforms.h b/transforms/transforms.h
similarity index 100%
rename from mlpp/transforms/transforms.h
rename to transforms/transforms.h
diff --git a/mlpp/uni_lin_reg/uni_lin_reg.cpp b/uni_lin_reg/uni_lin_reg.cpp
similarity index 100%
rename from mlpp/uni_lin_reg/uni_lin_reg.cpp
rename to uni_lin_reg/uni_lin_reg.cpp
diff --git a/mlpp/uni_lin_reg/uni_lin_reg.h b/uni_lin_reg/uni_lin_reg.h
similarity index 100%
rename from mlpp/uni_lin_reg/uni_lin_reg.h
rename to uni_lin_reg/uni_lin_reg.h
diff --git a/mlpp/utilities/utilities.cpp b/utilities/utilities.cpp
similarity index 100%
rename from mlpp/utilities/utilities.cpp
rename to utilities/utilities.cpp
diff --git a/mlpp/utilities/utilities.h b/utilities/utilities.h
similarity index 100%
rename from mlpp/utilities/utilities.h
rename to utilities/utilities.h
diff --git a/mlpp/wgan/wgan.cpp b/wgan/wgan.cpp
similarity index 100%
rename from mlpp/wgan/wgan.cpp
rename to wgan/wgan.cpp
diff --git a/mlpp/wgan/wgan.h b/wgan/wgan.h
similarity index 100%
rename from mlpp/wgan/wgan.h
rename to wgan/wgan.h