diff --git a/src/eval/nnue/architectures/halfkp-cr-ep_256x2-32-32.h b/src/nnue/architectures/halfkp-cr-ep_256x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/halfkp-cr-ep_256x2-32-32.h
rename to src/nnue/architectures/halfkp-cr-ep_256x2-32-32.h
diff --git a/src/eval/nnue/architectures/halfkp_256x2-32-32.h b/src/nnue/architectures/halfkp_256x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/halfkp_256x2-32-32.h
rename to src/nnue/architectures/halfkp_256x2-32-32.h
diff --git a/src/eval/nnue/architectures/halfkp_384x2-32-32.h b/src/nnue/architectures/halfkp_384x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/halfkp_384x2-32-32.h
rename to src/nnue/architectures/halfkp_384x2-32-32.h
diff --git a/src/eval/nnue/architectures/k-p-cr-ep_256x2-32-32.h b/src/nnue/architectures/k-p-cr-ep_256x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/k-p-cr-ep_256x2-32-32.h
rename to src/nnue/architectures/k-p-cr-ep_256x2-32-32.h
diff --git a/src/eval/nnue/architectures/k-p-cr_256x2-32-32.h b/src/nnue/architectures/k-p-cr_256x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/k-p-cr_256x2-32-32.h
rename to src/nnue/architectures/k-p-cr_256x2-32-32.h
diff --git a/src/eval/nnue/architectures/k-p_256x2-32-32.h b/src/nnue/architectures/k-p_256x2-32-32.h
similarity index 100%
rename from src/eval/nnue/architectures/k-p_256x2-32-32.h
rename to src/nnue/architectures/k-p_256x2-32-32.h
diff --git a/src/eval/nnue/evaluate_nnue.cpp b/src/nnue/evaluate_nnue.cpp
similarity index 100%
rename from src/eval/nnue/evaluate_nnue.cpp
rename to src/nnue/evaluate_nnue.cpp
diff --git a/src/eval/nnue/evaluate_nnue.h b/src/nnue/evaluate_nnue.h
similarity index 100%
rename from src/eval/nnue/evaluate_nnue.h
rename to src/nnue/evaluate_nnue.h
diff --git a/src/eval/nnue/evaluate_nnue_learner.cpp b/src/nnue/evaluate_nnue_learner.cpp
similarity index 100%
rename from src/eval/nnue/evaluate_nnue_learner.cpp
rename to src/nnue/evaluate_nnue_learner.cpp
diff --git a/src/eval/nnue/evaluate_nnue_learner.h b/src/nnue/evaluate_nnue_learner.h
similarity index 100%
rename from src/eval/nnue/evaluate_nnue_learner.h
rename to src/nnue/evaluate_nnue_learner.h
diff --git a/src/eval/nnue/features/castling_right.cpp b/src/nnue/features/castling_right.cpp
similarity index 100%
rename from src/eval/nnue/features/castling_right.cpp
rename to src/nnue/features/castling_right.cpp
diff --git a/src/eval/nnue/features/castling_right.h b/src/nnue/features/castling_right.h
similarity index 100%
rename from src/eval/nnue/features/castling_right.h
rename to src/nnue/features/castling_right.h
diff --git a/src/eval/nnue/features/enpassant.cpp b/src/nnue/features/enpassant.cpp
similarity index 100%
rename from src/eval/nnue/features/enpassant.cpp
rename to src/nnue/features/enpassant.cpp
diff --git a/src/eval/nnue/features/enpassant.h b/src/nnue/features/enpassant.h
similarity index 100%
rename from src/eval/nnue/features/enpassant.h
rename to src/nnue/features/enpassant.h
diff --git a/src/eval/nnue/features/feature_set.h b/src/nnue/features/feature_set.h
similarity index 100%
rename from src/eval/nnue/features/feature_set.h
rename to src/nnue/features/feature_set.h
diff --git a/src/eval/nnue/features/features_common.h b/src/nnue/features/features_common.h
similarity index 100%
rename from src/eval/nnue/features/features_common.h
rename to src/nnue/features/features_common.h
diff --git a/src/eval/nnue/features/half_kp.cpp b/src/nnue/features/half_kp.cpp
similarity index 100%
rename from src/eval/nnue/features/half_kp.cpp
rename to src/nnue/features/half_kp.cpp
diff --git a/src/eval/nnue/features/half_kp.h b/src/nnue/features/half_kp.h
similarity index 100%
rename from src/eval/nnue/features/half_kp.h
rename to src/nnue/features/half_kp.h
diff --git a/src/eval/nnue/features/half_relative_kp.cpp b/src/nnue/features/half_relative_kp.cpp
similarity index 100%
rename from src/eval/nnue/features/half_relative_kp.cpp
rename to src/nnue/features/half_relative_kp.cpp
diff --git a/src/eval/nnue/features/half_relative_kp.h b/src/nnue/features/half_relative_kp.h
similarity index 100%
rename from src/eval/nnue/features/half_relative_kp.h
rename to src/nnue/features/half_relative_kp.h
diff --git a/src/eval/nnue/features/index_list.h b/src/nnue/features/index_list.h
similarity index 100%
rename from src/eval/nnue/features/index_list.h
rename to src/nnue/features/index_list.h
diff --git a/src/eval/nnue/features/k.cpp b/src/nnue/features/k.cpp
similarity index 100%
rename from src/eval/nnue/features/k.cpp
rename to src/nnue/features/k.cpp
diff --git a/src/eval/nnue/features/k.h b/src/nnue/features/k.h
similarity index 100%
rename from src/eval/nnue/features/k.h
rename to src/nnue/features/k.h
diff --git a/src/eval/nnue/features/p.cpp b/src/nnue/features/p.cpp
similarity index 100%
rename from src/eval/nnue/features/p.cpp
rename to src/nnue/features/p.cpp
diff --git a/src/eval/nnue/features/p.h b/src/nnue/features/p.h
similarity index 100%
rename from src/eval/nnue/features/p.h
rename to src/nnue/features/p.h
diff --git a/src/eval/nnue/layers/affine_transform.h b/src/nnue/layers/affine_transform.h
similarity index 100%
rename from src/eval/nnue/layers/affine_transform.h
rename to src/nnue/layers/affine_transform.h
diff --git a/src/eval/nnue/layers/clipped_relu.h b/src/nnue/layers/clipped_relu.h
similarity index 100%
rename from src/eval/nnue/layers/clipped_relu.h
rename to src/nnue/layers/clipped_relu.h
diff --git a/src/eval/nnue/layers/input_slice.h b/src/nnue/layers/input_slice.h
similarity index 100%
rename from src/eval/nnue/layers/input_slice.h
rename to src/nnue/layers/input_slice.h
diff --git a/src/eval/nnue/layers/sum.h b/src/nnue/layers/sum.h
similarity index 100%
rename from src/eval/nnue/layers/sum.h
rename to src/nnue/layers/sum.h
diff --git a/src/eval/nnue/nnue_accumulator.h b/src/nnue/nnue_accumulator.h
similarity index 100%
rename from src/eval/nnue/nnue_accumulator.h
rename to src/nnue/nnue_accumulator.h
diff --git a/src/eval/nnue/nnue_architecture.h b/src/nnue/nnue_architecture.h
similarity index 100%
rename from src/eval/nnue/nnue_architecture.h
rename to src/nnue/nnue_architecture.h
diff --git a/src/eval/nnue/nnue_common.h b/src/nnue/nnue_common.h
similarity index 100%
rename from src/eval/nnue/nnue_common.h
rename to src/nnue/nnue_common.h
diff --git a/src/eval/nnue/nnue_feature_transformer.h b/src/nnue/nnue_feature_transformer.h
similarity index 100%
rename from src/eval/nnue/nnue_feature_transformer.h
rename to src/nnue/nnue_feature_transformer.h
diff --git a/src/eval/nnue/nnue_test_command.cpp b/src/nnue/nnue_test_command.cpp
similarity index 100%
rename from src/eval/nnue/nnue_test_command.cpp
rename to src/nnue/nnue_test_command.cpp
diff --git a/src/eval/nnue/nnue_test_command.h b/src/nnue/nnue_test_command.h
similarity index 100%
rename from src/eval/nnue/nnue_test_command.h
rename to src/nnue/nnue_test_command.h
diff --git a/src/eval/nnue/trainer/features/factorizer.h b/src/nnue/trainer/features/factorizer.h
similarity index 100%
rename from src/eval/nnue/trainer/features/factorizer.h
rename to src/nnue/trainer/features/factorizer.h
diff --git a/src/eval/nnue/trainer/features/factorizer_feature_set.h b/src/nnue/trainer/features/factorizer_feature_set.h
similarity index 100%
rename from src/eval/nnue/trainer/features/factorizer_feature_set.h
rename to src/nnue/trainer/features/factorizer_feature_set.h
diff --git a/src/eval/nnue/trainer/features/factorizer_half_kp.h b/src/nnue/trainer/features/factorizer_half_kp.h
similarity index 100%
rename from src/eval/nnue/trainer/features/factorizer_half_kp.h
rename to src/nnue/trainer/features/factorizer_half_kp.h
diff --git a/src/eval/nnue/trainer/trainer.h b/src/nnue/trainer/trainer.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer.h
rename to src/nnue/trainer/trainer.h
diff --git a/src/eval/nnue/trainer/trainer_affine_transform.h b/src/nnue/trainer/trainer_affine_transform.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer_affine_transform.h
rename to src/nnue/trainer/trainer_affine_transform.h
diff --git a/src/eval/nnue/trainer/trainer_clipped_relu.h b/src/nnue/trainer/trainer_clipped_relu.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer_clipped_relu.h
rename to src/nnue/trainer/trainer_clipped_relu.h
diff --git a/src/eval/nnue/trainer/trainer_feature_transformer.h b/src/nnue/trainer/trainer_feature_transformer.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer_feature_transformer.h
rename to src/nnue/trainer/trainer_feature_transformer.h
diff --git a/src/eval/nnue/trainer/trainer_input_slice.h b/src/nnue/trainer/trainer_input_slice.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer_input_slice.h
rename to src/nnue/trainer/trainer_input_slice.h
diff --git a/src/eval/nnue/trainer/trainer_sum.h b/src/nnue/trainer/trainer_sum.h
similarity index 100%
rename from src/eval/nnue/trainer/trainer_sum.h
rename to src/nnue/trainer/trainer_sum.h