diff --git a/hippocrates/cnn/sources/Sources.vcxproj b/hippocrates/cnn/source/Sources.vcxproj
similarity index 100%
rename from hippocrates/cnn/sources/Sources.vcxproj
rename to hippocrates/cnn/source/Sources.vcxproj
diff --git a/hippocrates/cnn/sources/Sources.vcxproj.filters b/hippocrates/cnn/source/Sources.vcxproj.filters
similarity index 100%
rename from hippocrates/cnn/sources/Sources.vcxproj.filters
rename to hippocrates/cnn/source/Sources.vcxproj.filters
diff --git a/hippocrates/cnn/sources/headers/InputData/iinput_data.hpp b/hippocrates/cnn/source/header/input_data/iinput_data.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/InputData/iinput_data.hpp
rename to hippocrates/cnn/source/header/input_data/iinput_data.hpp
diff --git a/hippocrates/cnn/sources/headers/InputData/image.hpp b/hippocrates/cnn/source/header/input_data/image.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/InputData/image.hpp
rename to hippocrates/cnn/source/header/input_data/image.hpp
diff --git a/hippocrates/cnn/sources/headers/InputData/sentence.hpp b/hippocrates/cnn/source/header/input_data/sentence.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/InputData/sentence.hpp
rename to hippocrates/cnn/source/header/input_data/sentence.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/filter.hpp b/hippocrates/cnn/source/header/layer/filter.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/filter.hpp
rename to hippocrates/cnn/source/header/layer/filter.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/filters.hpp b/hippocrates/cnn/source/header/layer/filters.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/filters.hpp
rename to hippocrates/cnn/source/header/layer/filters.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/fully_connected_neural_network.hpp b/hippocrates/cnn/source/header/layer/fully_connected_neural_network.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/fully_connected_neural_network.hpp
rename to hippocrates/cnn/source/header/layer/fully_connected_neural_network.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/ilayer.hpp b/hippocrates/cnn/source/header/layer/ilayer.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/ilayer.hpp
rename to hippocrates/cnn/source/header/layer/ilayer.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/layers.hpp b/hippocrates/cnn/source/header/layer/layers.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/layers.hpp
rename to hippocrates/cnn/source/header/layer/layers.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/Pooler/ipooler.hpp b/hippocrates/cnn/source/header/layer/pooler/ipooler.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/Pooler/ipooler.hpp
rename to hippocrates/cnn/source/header/layer/pooler/ipooler.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/Pooler/max_pooler.hpp b/hippocrates/cnn/source/header/layer/pooler/max_pooler.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/Pooler/max_pooler.hpp
rename to hippocrates/cnn/source/header/layer/pooler/max_pooler.hpp
diff --git a/hippocrates/cnn/sources/headers/Layer/relu.hpp b/hippocrates/cnn/source/header/layer/relu.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Layer/relu.hpp
rename to hippocrates/cnn/source/header/layer/relu.hpp
diff --git a/hippocrates/cnn/sources/headers/Learning/backpropagation.hpp b/hippocrates/cnn/source/header/learning/backpropagation.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Learning/backpropagation.hpp
rename to hippocrates/cnn/source/header/learning/backpropagation.hpp
diff --git a/hippocrates/cnn/sources/headers/Learning/learning_method.hpp b/hippocrates/cnn/source/header/learning/learning_method.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Learning/learning_method.hpp
rename to hippocrates/cnn/source/header/learning/learning_method.hpp
diff --git a/hippocrates/cnn/sources/headers/matrix.hpp b/hippocrates/cnn/source/header/matrix.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/matrix.hpp
rename to hippocrates/cnn/source/header/matrix.hpp
diff --git a/hippocrates/cnn/sources/headers/multi_matrix.hpp b/hippocrates/cnn/source/header/multi_matrix.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/multi_matrix.hpp
rename to hippocrates/cnn/source/header/multi_matrix.hpp
diff --git a/hippocrates/cnn/sources/headers/multi_matrix_factory.hpp b/hippocrates/cnn/source/header/multi_matrix_factory.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/multi_matrix_factory.hpp
rename to hippocrates/cnn/source/header/multi_matrix_factory.hpp
diff --git a/hippocrates/cnn/sources/headers/neural_network.hpp b/hippocrates/cnn/source/header/neural_network.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/neural_network.hpp
rename to hippocrates/cnn/source/header/neural_network.hpp
diff --git a/hippocrates/cnn/sources/headers/neural_network_trainer.hpp b/hippocrates/cnn/source/header/neural_network_trainer.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/neural_network_trainer.hpp
rename to hippocrates/cnn/source/header/neural_network_trainer.hpp
diff --git a/hippocrates/cnn/sources/headers/training_data.hpp b/hippocrates/cnn/source/header/training_data.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/training_data.hpp
rename to hippocrates/cnn/source/header/training_data.hpp
diff --git a/hippocrates/cnn/sources/headers/Utility/fillable_ref.hpp b/hippocrates/cnn/source/header/utility/fillable_ref.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Utility/fillable_ref.hpp
rename to hippocrates/cnn/source/header/utility/fillable_ref.hpp
diff --git a/hippocrates/cnn/sources/headers/Utility/interface.hpp b/hippocrates/cnn/source/header/utility/interface.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Utility/interface.hpp
rename to hippocrates/cnn/source/header/utility/interface.hpp
diff --git a/hippocrates/cnn/sources/headers/Utility/utility.hpp b/hippocrates/cnn/source/header/utility/utility.hpp
similarity index 100%
rename from hippocrates/cnn/sources/headers/Utility/utility.hpp
rename to hippocrates/cnn/source/header/utility/utility.hpp
diff --git a/hippocrates/cnn/sources/implementations/InputData/image.cpp b/hippocrates/cnn/source/implementation/input_data/image.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/InputData/image.cpp
rename to hippocrates/cnn/source/implementation/input_data/image.cpp
diff --git a/hippocrates/cnn/sources/implementations/InputData/sentence.cpp b/hippocrates/cnn/source/implementation/input_data/sentence.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/InputData/sentence.cpp
rename to hippocrates/cnn/source/implementation/input_data/sentence.cpp
diff --git a/hippocrates/cnn/sources/implementations/Layer/filter.cpp b/hippocrates/cnn/source/implementation/layer/filter.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/Layer/filter.cpp
rename to hippocrates/cnn/source/implementation/layer/filter.cpp
diff --git a/hippocrates/cnn/sources/implementations/Layer/filters.cpp b/hippocrates/cnn/source/implementation/layer/filters.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/Layer/filters.cpp
rename to hippocrates/cnn/source/implementation/layer/filters.cpp
diff --git a/hippocrates/cnn/sources/implementations/Layer/fully_connected_neural_network.cpp b/hippocrates/cnn/source/implementation/layer/fully_connected_neural_network.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/Layer/fully_connected_neural_network.cpp
rename to hippocrates/cnn/source/implementation/layer/fully_connected_neural_network.cpp
diff --git a/hippocrates/cnn/sources/implementations/Layer/Pooler/max_pooler.cpp b/hippocrates/cnn/source/implementation/layer/pooler/max_pooler.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/Layer/Pooler/max_pooler.cpp
rename to hippocrates/cnn/source/implementation/layer/pooler/max_pooler.cpp
diff --git a/hippocrates/cnn/sources/implementations/Layer/relu.cpp b/hippocrates/cnn/source/implementation/layer/relu.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/Layer/relu.cpp
rename to hippocrates/cnn/source/implementation/layer/relu.cpp
diff --git a/hippocrates/cnn/sources/implementations/matrix.cpp b/hippocrates/cnn/source/implementation/matrix.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/matrix.cpp
rename to hippocrates/cnn/source/implementation/matrix.cpp
diff --git a/hippocrates/cnn/sources/implementations/multi_matrix.cpp b/hippocrates/cnn/source/implementation/multi_matrix.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/multi_matrix.cpp
rename to hippocrates/cnn/source/implementation/multi_matrix.cpp
diff --git a/hippocrates/cnn/sources/implementations/multi_matrix_factory.cpp b/hippocrates/cnn/source/implementation/multi_matrix_factory.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/multi_matrix_factory.cpp
rename to hippocrates/cnn/source/implementation/multi_matrix_factory.cpp
diff --git a/hippocrates/cnn/sources/implementations/neural_network_trainer.cpp b/hippocrates/cnn/source/implementation/neural_network_trainer.cpp
similarity index 100%
rename from hippocrates/cnn/sources/implementations/neural_network_trainer.cpp
rename to hippocrates/cnn/source/implementation/neural_network_trainer.cpp
diff --git a/hippocrates/cnn/tests/CMakeLists.txt b/hippocrates/cnn/test/CMakeLists.txt
similarity index 100%
rename from hippocrates/cnn/tests/CMakeLists.txt
rename to hippocrates/cnn/test/CMakeLists.txt
diff --git a/hippocrates/cnn/tests/sandbox/CMakeLists.txt b/hippocrates/cnn/test/sandbox/CMakeLists.txt
similarity index 100%
rename from hippocrates/cnn/tests/sandbox/CMakeLists.txt
rename to hippocrates/cnn/test/sandbox/CMakeLists.txt
diff --git a/hippocrates/cnn/tests/sandbox/Sandbox.vcxproj b/hippocrates/cnn/test/sandbox/Sandbox.vcxproj
similarity index 100%
rename from hippocrates/cnn/tests/sandbox/Sandbox.vcxproj
rename to hippocrates/cnn/test/sandbox/Sandbox.vcxproj
diff --git a/hippocrates/cnn/tests/sandbox/Sandbox.vcxproj.filters b/hippocrates/cnn/test/sandbox/Sandbox.vcxproj.filters
similarity index 100%
rename from hippocrates/cnn/tests/sandbox/Sandbox.vcxproj.filters
rename to hippocrates/cnn/test/sandbox/Sandbox.vcxproj.filters
diff --git a/hippocrates/cnn/tests/sandbox/sources/implementations/main.cpp b/hippocrates/cnn/test/sandbox/sources/implementations/main.cpp
similarity index 100%
rename from hippocrates/cnn/tests/sandbox/sources/implementations/main.cpp
rename to hippocrates/cnn/test/sandbox/sources/implementations/main.cpp
diff --git a/hippocrates/neat/core/sources/headers/activation_function/activation_function.hpp b/hippocrates/neat/core/source/header/activation_function/activation_function.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/activation_function/activation_function.hpp
rename to hippocrates/neat/core/source/header/activation_function/activation_function.hpp
diff --git a/hippocrates/neat/core/sources/headers/activation_function/activation_function_factory.hpp b/hippocrates/neat/core/source/header/activation_function/activation_function_factory.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/activation_function/activation_function_factory.hpp
rename to hippocrates/neat/core/source/header/activation_function/activation_function_factory.hpp
diff --git a/hippocrates/neat/core/sources/headers/activation_function/fast_sigmoid.hpp b/hippocrates/neat/core/source/header/activation_function/fast_sigmoid.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/activation_function/fast_sigmoid.hpp
rename to hippocrates/neat/core/source/header/activation_function/fast_sigmoid.hpp
diff --git a/hippocrates/neat/core/sources/headers/activation_function/possible_activation_functions.hpp b/hippocrates/neat/core/source/header/activation_function/possible_activation_functions.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/activation_function/possible_activation_functions.hpp
rename to hippocrates/neat/core/source/header/activation_function/possible_activation_functions.hpp
diff --git a/hippocrates/neat/core/sources/headers/activation_function/tanh.hpp b/hippocrates/neat/core/source/header/activation_function/tanh.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/activation_function/tanh.hpp
rename to hippocrates/neat/core/source/header/activation_function/tanh.hpp
diff --git a/hippocrates/neat/core/sources/headers/body/body.hpp b/hippocrates/neat/core/source/header/body/body.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/body/body.hpp
rename to hippocrates/neat/core/source/header/body/body.hpp
diff --git a/hippocrates/neat/core/sources/headers/body/supervised_learning.hpp b/hippocrates/neat/core/source/header/body/supervised_learning.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/body/supervised_learning.hpp
rename to hippocrates/neat/core/source/header/body/supervised_learning.hpp
diff --git a/hippocrates/neat/core/sources/headers/genotype/gene.hpp b/hippocrates/neat/core/source/header/genotype/gene.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/genotype/gene.hpp
rename to hippocrates/neat/core/source/header/genotype/gene.hpp
diff --git a/hippocrates/neat/core/sources/headers/genotype/genome.hpp b/hippocrates/neat/core/source/header/genotype/genome.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/genotype/genome.hpp
rename to hippocrates/neat/core/source/header/genotype/genome.hpp
diff --git a/hippocrates/neat/core/sources/headers/phenotype/neural_network.hpp b/hippocrates/neat/core/source/header/phenotype/neural_network.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/phenotype/neural_network.hpp
rename to hippocrates/neat/core/source/header/phenotype/neural_network.hpp
diff --git a/hippocrates/neat/core/sources/headers/phenotype/neuron.hpp b/hippocrates/neat/core/source/header/phenotype/neuron.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/phenotype/neuron.hpp
rename to hippocrates/neat/core/source/header/phenotype/neuron.hpp
diff --git a/hippocrates/neat/core/sources/headers/phenotype/organism.hpp b/hippocrates/neat/core/source/header/phenotype/organism.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/phenotype/organism.hpp
rename to hippocrates/neat/core/source/header/phenotype/organism.hpp
diff --git a/hippocrates/neat/core/sources/headers/trained/classifier.hpp b/hippocrates/neat/core/source/header/trained/classifier.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/trained/classifier.hpp
rename to hippocrates/neat/core/source/header/trained/classifier.hpp
diff --git a/hippocrates/neat/core/sources/headers/trained/neural_network.hpp b/hippocrates/neat/core/source/header/trained/neural_network.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/trained/neural_network.hpp
rename to hippocrates/neat/core/source/header/trained/neural_network.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/data.hpp b/hippocrates/neat/core/source/header/training/data.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/data.hpp
rename to hippocrates/neat/core/source/header/training/data.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/innovation_cacher.hpp b/hippocrates/neat/core/source/header/training/innovation_cacher.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/innovation_cacher.hpp
rename to hippocrates/neat/core/source/header/training/innovation_cacher.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/neural_network_trainer.hpp b/hippocrates/neat/core/source/header/training/neural_network_trainer.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/neural_network_trainer.hpp
rename to hippocrates/neat/core/source/header/training/neural_network_trainer.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/parameters.hpp b/hippocrates/neat/core/source/header/training/parameters.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/parameters.hpp
rename to hippocrates/neat/core/source/header/training/parameters.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/species.hpp b/hippocrates/neat/core/source/header/training/species.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/species.hpp
rename to hippocrates/neat/core/source/header/training/species.hpp
diff --git a/hippocrates/neat/core/sources/headers/training/species_manager.hpp b/hippocrates/neat/core/source/header/training/species_manager.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/training/species_manager.hpp
rename to hippocrates/neat/core/source/header/training/species_manager.hpp
diff --git a/hippocrates/neat/core/sources/headers/type.hpp b/hippocrates/neat/core/source/header/type.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/type.hpp
rename to hippocrates/neat/core/source/header/type.hpp
diff --git a/hippocrates/neat/core/sources/headers/utility/fillable_ref.hpp b/hippocrates/neat/core/source/header/utility/fillable_ref.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/utility/fillable_ref.hpp
rename to hippocrates/neat/core/source/header/utility/fillable_ref.hpp
diff --git a/hippocrates/neat/core/sources/headers/utility/interface.hpp b/hippocrates/neat/core/source/header/utility/interface.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/utility/interface.hpp
rename to hippocrates/neat/core/source/header/utility/interface.hpp
diff --git a/hippocrates/neat/core/sources/headers/utility/jsmn.h b/hippocrates/neat/core/source/header/utility/jsmn.h
similarity index 100%
rename from hippocrates/neat/core/sources/headers/utility/jsmn.h
rename to hippocrates/neat/core/source/header/utility/jsmn.h
diff --git a/hippocrates/neat/core/sources/headers/utility/logger.hpp b/hippocrates/neat/core/source/header/utility/logger.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/utility/logger.hpp
rename to hippocrates/neat/core/source/header/utility/logger.hpp
diff --git a/hippocrates/neat/core/sources/headers/utility/random.hpp b/hippocrates/neat/core/source/header/utility/random.hpp
similarity index 100%
rename from hippocrates/neat/core/sources/headers/utility/random.hpp
rename to hippocrates/neat/core/source/header/utility/random.hpp
diff --git a/hippocrates/neat/core/sources/implementations/genotype/gene.cpp b/hippocrates/neat/core/source/implementation/genotype/gene.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/genotype/gene.cpp
rename to hippocrates/neat/core/source/implementation/genotype/gene.cpp
diff --git a/hippocrates/neat/core/sources/implementations/genotype/genome.cpp b/hippocrates/neat/core/source/implementation/genotype/genome.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/genotype/genome.cpp
rename to hippocrates/neat/core/source/implementation/genotype/genome.cpp
diff --git a/hippocrates/neat/core/sources/implementations/phenotype/neural_network.cpp b/hippocrates/neat/core/source/implementation/phenotype/neural_network.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/phenotype/neural_network.cpp
rename to hippocrates/neat/core/source/implementation/phenotype/neural_network.cpp
diff --git a/hippocrates/neat/core/sources/implementations/phenotype/neuron.cpp b/hippocrates/neat/core/source/implementation/phenotype/neuron.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/phenotype/neuron.cpp
rename to hippocrates/neat/core/source/implementation/phenotype/neuron.cpp
diff --git a/hippocrates/neat/core/sources/implementations/phenotype/organism.cpp b/hippocrates/neat/core/source/implementation/phenotype/organism.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/phenotype/organism.cpp
rename to hippocrates/neat/core/source/implementation/phenotype/organism.cpp
diff --git a/hippocrates/neat/core/sources/implementations/training/innovation_cacher.cpp b/hippocrates/neat/core/source/implementation/training/innovation_cacher.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/training/innovation_cacher.cpp
rename to hippocrates/neat/core/source/implementation/training/innovation_cacher.cpp
diff --git a/hippocrates/neat/core/sources/implementations/training/neural_network_trainer.cpp b/hippocrates/neat/core/source/implementation/training/neural_network_trainer.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/training/neural_network_trainer.cpp
rename to hippocrates/neat/core/source/implementation/training/neural_network_trainer.cpp
diff --git a/hippocrates/neat/core/sources/implementations/training/parameters.cpp b/hippocrates/neat/core/source/implementation/training/parameters.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/training/parameters.cpp
rename to hippocrates/neat/core/source/implementation/training/parameters.cpp
diff --git a/hippocrates/neat/core/sources/implementations/training/species.cpp b/hippocrates/neat/core/source/implementation/training/species.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/training/species.cpp
rename to hippocrates/neat/core/source/implementation/training/species.cpp
diff --git a/hippocrates/neat/core/sources/implementations/training/species_manager.cpp b/hippocrates/neat/core/source/implementation/training/species_manager.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/training/species_manager.cpp
rename to hippocrates/neat/core/source/implementation/training/species_manager.cpp
diff --git a/hippocrates/neat/core/sources/implementations/utility/jsmn.c b/hippocrates/neat/core/source/implementation/utility/jsmn.c
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/utility/jsmn.c
rename to hippocrates/neat/core/source/implementation/utility/jsmn.c
diff --git a/hippocrates/neat/core/sources/implementations/utility/logger.cpp b/hippocrates/neat/core/source/implementation/utility/logger.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/utility/logger.cpp
rename to hippocrates/neat/core/source/implementation/utility/logger.cpp
diff --git a/hippocrates/neat/core/sources/implementations/utility/random.cpp b/hippocrates/neat/core/source/implementation/utility/random.cpp
similarity index 100%
rename from hippocrates/neat/core/sources/implementations/utility/random.cpp
rename to hippocrates/neat/core/source/implementation/utility/random.cpp
diff --git a/hippocrates/neat/core/tests/CMakeLists.txt b/hippocrates/neat/core/test/CMakeLists.txt
similarity index 100%
rename from hippocrates/neat/core/tests/CMakeLists.txt
rename to hippocrates/neat/core/test/CMakeLists.txt
diff --git a/hippocrates/neat/core/tests/README.md b/hippocrates/neat/core/test/README.md
similarity index 100%
rename from hippocrates/neat/core/tests/README.md
rename to hippocrates/neat/core/test/README.md
diff --git a/hippocrates/neat/core/tests/EvenNumbers/CMakeLists.txt b/hippocrates/neat/core/test/even_numbers/CMakeLists.txt
similarity index 100%
rename from hippocrates/neat/core/tests/EvenNumbers/CMakeLists.txt
rename to hippocrates/neat/core/test/even_numbers/CMakeLists.txt
diff --git a/hippocrates/neat/core/tests/EvenNumbers/EvenNumbers.vcxproj b/hippocrates/neat/core/test/even_numbers/EvenNumbers.vcxproj
similarity index 100%
rename from hippocrates/neat/core/tests/EvenNumbers/EvenNumbers.vcxproj
rename to hippocrates/neat/core/test/even_numbers/EvenNumbers.vcxproj
diff --git a/hippocrates/neat/core/tests/EvenNumbers/EvenNumbers.vcxproj.filters b/hippocrates/neat/core/test/even_numbers/EvenNumbers.vcxproj.filters
similarity index 100%
rename from hippocrates/neat/core/tests/EvenNumbers/EvenNumbers.vcxproj.filters
rename to hippocrates/neat/core/test/even_numbers/EvenNumbers.vcxproj.filters
diff --git a/hippocrates/neat/core/tests/EvenNumbers/README.md b/hippocrates/neat/core/test/even_numbers/README.md
similarity index 100%
rename from hippocrates/neat/core/tests/EvenNumbers/README.md
rename to hippocrates/neat/core/test/even_numbers/README.md
diff --git a/hippocrates/neat/core/tests/EvenNumbers/Sources/Implementations/main.cpp b/hippocrates/neat/core/test/even_numbers/source/implementation/main.cpp
similarity index 100%
rename from hippocrates/neat/core/tests/EvenNumbers/Sources/Implementations/main.cpp
rename to hippocrates/neat/core/test/even_numbers/source/implementation/main.cpp
diff --git a/hippocrates/neat/core/tests/TestingUtilities/TestingUtilities.vcxproj b/hippocrates/neat/core/test/testing_utilities/TestingUtilities.vcxproj
similarity index 100%
rename from hippocrates/neat/core/tests/TestingUtilities/TestingUtilities.vcxproj
rename to hippocrates/neat/core/test/testing_utilities/TestingUtilities.vcxproj
diff --git a/hippocrates/neat/core/tests/TestingUtilities/TestingUtilities.vcxproj.filters b/hippocrates/neat/core/test/testing_utilities/TestingUtilities.vcxproj.filters
similarity index 100%
rename from hippocrates/neat/core/tests/TestingUtilities/TestingUtilities.vcxproj.filters
rename to hippocrates/neat/core/test/testing_utilities/TestingUtilities.vcxproj.filters
diff --git a/hippocrates/neat/core/tests/TestingUtilities/Sources/Headers/testing_utilities.hpp b/hippocrates/neat/core/test/testing_utilities/source/header/testing_utilities.hpp
similarity index 100%
rename from hippocrates/neat/core/tests/TestingUtilities/Sources/Headers/testing_utilities.hpp
rename to hippocrates/neat/core/test/testing_utilities/source/header/testing_utilities.hpp
diff --git a/hippocrates/neat/core/tests/TestingUtilities/Sources/Implementations/testing_utilities.cpp b/hippocrates/neat/core/test/testing_utilities/source/implementation/testing_utilities.cpp
similarity index 100%
rename from hippocrates/neat/core/tests/TestingUtilities/Sources/Implementations/testing_utilities.cpp
rename to hippocrates/neat/core/test/testing_utilities/source/implementation/testing_utilities.cpp
diff --git a/hippocrates/neat/core/tests/xor_three_bits/CMakeLists.txt b/hippocrates/neat/core/test/xor_three_bits/CMakeLists.txt
similarity index 100%
rename from hippocrates/neat/core/tests/xor_three_bits/CMakeLists.txt
rename to hippocrates/neat/core/test/xor_three_bits/CMakeLists.txt
diff --git a/hippocrates/neat/core/tests/xor_three_bits/README.md b/hippocrates/neat/core/test/xor_three_bits/README.md
similarity index 100%
rename from hippocrates/neat/core/tests/xor_three_bits/README.md
rename to hippocrates/neat/core/test/xor_three_bits/README.md
diff --git a/hippocrates/neat/core/tests/xor_three_bits/Sources/Implementations/main.cpp b/hippocrates/neat/core/test/xor_three_bits/source/implementation/main.cpp
similarity index 100%
rename from hippocrates/neat/core/tests/xor_three_bits/Sources/Implementations/main.cpp
rename to hippocrates/neat/core/test/xor_three_bits/source/implementation/main.cpp
diff --git a/hippocrates/neat/core/tests/xor_three_bits/xor_three_bits.vcxproj b/hippocrates/neat/core/test/xor_three_bits/xor_three_bits.vcxproj
similarity index 100%
rename from hippocrates/neat/core/tests/xor_three_bits/xor_three_bits.vcxproj
rename to hippocrates/neat/core/test/xor_three_bits/xor_three_bits.vcxproj
diff --git a/hippocrates/neat/core/tests/xor_three_bits/xor_three_bits.vcxproj.filters b/hippocrates/neat/core/test/xor_three_bits/xor_three_bits.vcxproj.filters
similarity index 100%
rename from hippocrates/neat/core/tests/xor_three_bits/xor_three_bits.vcxproj.filters
rename to hippocrates/neat/core/test/xor_three_bits/xor_three_bits.vcxproj.filters
diff --git a/hippocrates/neat/core/tests/xor_two_bits/CMakeLists.txt b/hippocrates/neat/core/test/xor_two_bits/CMakeLists.txt
similarity index 100%
rename from hippocrates/neat/core/tests/xor_two_bits/CMakeLists.txt
rename to hippocrates/neat/core/test/xor_two_bits/CMakeLists.txt
diff --git a/hippocrates/neat/core/tests/xor_two_bits/README.md b/hippocrates/neat/core/test/xor_two_bits/README.md
similarity index 100%
rename from hippocrates/neat/core/tests/xor_two_bits/README.md
rename to hippocrates/neat/core/test/xor_two_bits/README.md
diff --git a/hippocrates/neat/core/tests/xor_two_bits/Sources/Implementations/main.cpp b/hippocrates/neat/core/test/xor_two_bits/source/implementation/main.cpp
similarity index 100%
rename from hippocrates/neat/core/tests/xor_two_bits/Sources/Implementations/main.cpp
rename to hippocrates/neat/core/test/xor_two_bits/source/implementation/main.cpp
diff --git a/hippocrates/neat/core/tests/xor_two_bits/xor_two_bits.vcxproj b/hippocrates/neat/core/test/xor_two_bits/xor_two_bits.vcxproj
similarity index 100%
rename from hippocrates/neat/core/tests/xor_two_bits/xor_two_bits.vcxproj
rename to hippocrates/neat/core/test/xor_two_bits/xor_two_bits.vcxproj
diff --git a/hippocrates/neat/core/tests/xor_two_bits/xor_two_bits.vcxproj.filters b/hippocrates/neat/core/test/xor_two_bits/xor_two_bits.vcxproj.filters
similarity index 100%
rename from hippocrates/neat/core/tests/xor_two_bits/xor_two_bits.vcxproj.filters
rename to hippocrates/neat/core/test/xor_two_bits/xor_two_bits.vcxproj.filters