diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33cdab5..7cd1ebf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
-project(AIImagePrepross)
-
-find_package(OpenCV REQUIRED)
+project(ImageAiUtils)
 
 set(CMAKE_CXX_STANDARD 17)
+set(WEIGHT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Weights)
 
-set(SRC_FILES main.cpp yolo.cpp tokenize.cpp log.cpp seamcarving.cpp utils.cpp intelligentroi.cpp facerecognizer.cpp)
-
-add_executable(${PROJECT_NAME} ${SRC_FILES})
-target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} -ltbb)
-target_include_directories(${PROJECT_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS})
-target_compile_options(${PROJECT_NAME} PRIVATE -s -g -Wall)
-
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+add_subdirectory(SmartCrop)
diff --git a/PersonDatasetAssembler/PersonDatasetAssembler.py b/PersonDatasetAssembler/PersonDatasetAssembler.py
new file mode 100755
index 0000000..d7086c9
--- /dev/null
+++ b/PersonDatasetAssembler/PersonDatasetAssembler.py
@@ -0,0 +1,149 @@
+#!/bin/python3
+import argparse
+import os
+from typing import Iterator
+import cv2
+import numpy
+from tqdm import tqdm
+from wand.exceptions import BlobError
+from wand.image import Image
+
+image_ext_ocv = [".bmp", ".jpeg", ".jpg", ".png"]
+image_ext_wand = [".dng", ".arw"]
+
+
+class LoadException(Exception):
+	pass
+
+
+def find_image_files(path: str) -> list[str]:
+	paths = list()
+	for root, dirs, files in os.walk(path):
+		for filename in files:
+			name, extension = os.path.splitext(filename)
+			if extension.lower() in image_ext_ocv or extension in image_ext_wand:
+				paths.append(os.path.join(root, filename))
+	return paths
+
+
+def image_loader(paths: list[str]) -> Iterator[numpy.ndarray]:
+	for path in paths:
+		name, extension = os.path.splitext(path)
+		extension = extension.lower()
+		if extension in image_ext_ocv:
+			image = cv2.imread(path)
+			if image is None:
+				print(f"Warning: could not load {path}")
+			else:
+				yield image
+		elif extension in image_ext_wand:
+			try:
+				image = Image(filename=path)
+			except BlobError as e:
+				print(f"Warning: could not load {path}, {e}")
+				continue
+
+
+def extract_video_images(video: cv2.VideoCapture, interval: int = 0):
+	ret = True
+	frame_counter = 0
+	while ret:
+		ret, frame = video.read()
+		if ret and frame_counter % interval == 0:
+			yield frame
+		frame_counter += 1
+
+
+def contains_face_match(detector: cv2.FaceDetectorYN, recognizer: cv2.FaceRecognizerSF, image: numpy.ndarray, referance_features: list(), thresh: float) -> bool:
+	detector.setInputSize([image.shape[1], image.shape[0]])
+	faces = detector.detect(image)[1]
+	if faces is None:
+		return 0, False
+	for face in faces:
+		cropped_image = recognizer.alignCrop(image, face)
+		features = recognizer.feature(cropped_image)
+		score_accum = 0.0
+		for referance in referance_features:
+			score_accum += recognizer.match(referance, features, 0)
+		score = score_accum / len(referance_features)
+		if score > thresh:
+			return score, True
+	return 0, False
+
+
+def process_referance(detector: cv2.FaceDetectorYN, recognizer: cv2.FaceRecognizerSF, referance_path: str) -> list():
+	images = list()
+	out = list()
+
+	if os.path.isfile(referance_path):
+		image = cv2.imread(referance_path)
+		if image is None:
+			print(f"Could not load image from {referance_path}")
+		else:
+			images.append(image)
+	elif os.path.isdir(referance_path):
+		filenames = find_image_files(referance_path)
+		images = list(image_loader(filenames))
+
+	for image in images:
+		detector.setInputSize([image.shape[1], image.shape[0]])
+		faces = detector.detect(image)[1]
+		image = recognizer.alignCrop(image, faces[0])
+		features = recognizer.feature(image)
+		out.append(features)
+
+	return out
+
+if __name__ == "__main__":
+	parser = argparse.ArgumentParser("Script to assemble a dataset of images of a specific person")
+	parser.add_argument('--out', '-o', default="out", help="place to put dataset")
+	parser.add_argument('--input', '-i', required=True, help="directory or video file to get images from")
+	parser.add_argument('--skip', '-s', default=0, type=int, help="skip n frames between samples when grabbing from a video file")
+	parser.add_argument('--referance', '-r', required=True, help="referance image or directory of images of the person to be found")
+	parser.add_argument('--match_model', '-m', required=True, help="Path to the onnx recognition model to be used")
+	parser.add_argument('--detect_model', '-d', required=True, help="Path to the onnx detection model to be used")
+	parser.add_argument('--threshold', '-t', default=0.362, type=float, help="match threshold to use")
+	args = parser.parse_args()
+
+	recognizer = cv2.FaceRecognizerSF.create(model=args.match_model, config="", backend_id=cv2.dnn.DNN_BACKEND_DEFAULT , target_id=cv2.dnn.DNN_TARGET_CPU)
+	detector = cv2.FaceDetectorYN.create(model=args.detect_model, config="", input_size=[320, 320],
+		score_threshold=0.6, nms_threshold=0.3, top_k=5000, backend_id=cv2.dnn.DNN_BACKEND_DEFAULT, target_id=cv2.dnn.DNN_TARGET_CPU)
+
+	referance_features = process_referance(detector, recognizer, args.referance)
+	if len(referance_features) < 1:
+		print(f"Could not load any referance image(s) from {args.referance}")
+		exit(1)
+
+	if os.path.isfile(args.input):
+		video = cv2.VideoCapture(args.input)
+		if not video.isOpened():
+			print(f"Unable to open {args.input} as a video file")
+			exit(1)
+		image_generator = extract_video_images(video, args.skip + 1)
+		total_images = int(video.get(cv2.CAP_PROP_FRAME_COUNT)) / (args.skip + 1)
+	elif os.path.isdir(args.input):
+		image_filenams = find_image_files(args.input)
+		image_generator = image_loader(image_filenams)
+		total_images = len(image_filenams)
+	else:
+		print(f"{args.input} is not a video file nor is it a directory")
+		exit(1)
+
+	os.makedirs(args.out, exist_ok=True)
+
+	progress = tqdm(total=int(total_images), desc="0.00")
+	counter = 0
+	for image in image_generator:
+		if image.shape[0] > 512:
+			aspect = image.shape[0] / image.shape[1]
+			resized = cv2.resize(image, (int(512 / aspect), 512), 0, 0, cv2.INTER_AREA)
+		else:
+			resized = image
+		score, match = contains_face_match(detector, recognizer, resized, referance_features, args.threshold)
+		if match:
+			filename = f"{counter:04}.png"
+			cv2.imwrite(os.path.join(args.out, filename), image)
+			counter += 1
+		progress.set_description(f"{score:1.2f}")
+		progress.update()
+
diff --git a/SmartCrop/CMakeLists.txt b/SmartCrop/CMakeLists.txt
new file mode 100644
index 0000000..e3787df
--- /dev/null
+++ b/SmartCrop/CMakeLists.txt
@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.6)
+
+find_package(OpenCV REQUIRED)
+
+set(CMAKE_CXX_STANDARD 17)
+
+set(SRC_FILES main.cpp yolo.cpp tokenize.cpp log.cpp seamcarving.cpp utils.cpp intelligentroi.cpp facerecognizer.cpp)
+
+add_executable(smartcrop ${SRC_FILES})
+target_link_libraries(smartcrop ${OpenCV_LIBS} -ltbb)
+target_include_directories(smartcrop PRIVATE ${OpenCV_INCLUDE_DIRS})
+target_compile_options(smartcrop PRIVATE -s -g -Wall)
+message(WARNING ${WEIGHT_DIR})
+target_compile_definitions(smartcrop PUBLIC WEIGHT_DIR="${WEIGHT_DIR}")
+
+install(TARGETS smartcrop RUNTIME DESTINATION bin)
diff --git a/facerecognizer.cpp b/SmartCrop/facerecognizer.cpp
similarity index 96%
rename from facerecognizer.cpp
rename to SmartCrop/facerecognizer.cpp
index 6534aaf..a01fb3c 100644
--- a/facerecognizer.cpp
+++ b/SmartCrop/facerecognizer.cpp
@@ -4,8 +4,8 @@
 #define INCBIN_PREFIX r
 #include "incbin.h"
 
-INCBIN(defaultRecognizer, "../face_recognition_sface_2021dec.onnx");
-INCBIN(defaultDetector, "../face_detection_yunet_2023mar.onnx");
+INCBIN(defaultRecognizer, WEIGHT_DIR "/face_recognition_sface_2021dec.onnx");
+INCBIN(defaultDetector, WEIGHT_DIR "/face_detection_yunet_2023mar.onnx");
 
 #include <opencv2/dnn/dnn.hpp>
 #include <opencv2/core.hpp>
diff --git a/facerecognizer.h b/SmartCrop/facerecognizer.h
similarity index 100%
rename from facerecognizer.h
rename to SmartCrop/facerecognizer.h
diff --git a/incbin.h b/SmartCrop/incbin.h
similarity index 100%
rename from incbin.h
rename to SmartCrop/incbin.h
diff --git a/intelligentroi.cpp b/SmartCrop/intelligentroi.cpp
similarity index 100%
rename from intelligentroi.cpp
rename to SmartCrop/intelligentroi.cpp
diff --git a/intelligentroi.h b/SmartCrop/intelligentroi.h
similarity index 100%
rename from intelligentroi.h
rename to SmartCrop/intelligentroi.h
diff --git a/log.cpp b/SmartCrop/log.cpp
similarity index 100%
rename from log.cpp
rename to SmartCrop/log.cpp
diff --git a/log.h b/SmartCrop/log.h
similarity index 100%
rename from log.h
rename to SmartCrop/log.h
diff --git a/main.cpp b/SmartCrop/main.cpp
similarity index 100%
rename from main.cpp
rename to SmartCrop/main.cpp
diff --git a/options.h b/SmartCrop/options.h
similarity index 100%
rename from options.h
rename to SmartCrop/options.h
diff --git a/readfile.h b/SmartCrop/readfile.h
similarity index 100%
rename from readfile.h
rename to SmartCrop/readfile.h
diff --git a/seamcarving.cpp b/SmartCrop/seamcarving.cpp
similarity index 100%
rename from seamcarving.cpp
rename to SmartCrop/seamcarving.cpp
diff --git a/seamcarving.h b/SmartCrop/seamcarving.h
similarity index 100%
rename from seamcarving.h
rename to SmartCrop/seamcarving.h
diff --git a/tokenize.cpp b/SmartCrop/tokenize.cpp
similarity index 100%
rename from tokenize.cpp
rename to SmartCrop/tokenize.cpp
diff --git a/tokenize.h b/SmartCrop/tokenize.h
similarity index 100%
rename from tokenize.h
rename to SmartCrop/tokenize.h
diff --git a/utils.cpp b/SmartCrop/utils.cpp
similarity index 100%
rename from utils.cpp
rename to SmartCrop/utils.cpp
diff --git a/utils.h b/SmartCrop/utils.h
similarity index 100%
rename from utils.h
rename to SmartCrop/utils.h
diff --git a/yolo.cpp b/SmartCrop/yolo.cpp
similarity index 98%
rename from yolo.cpp
rename to SmartCrop/yolo.cpp
index 9379ddd..cc32b89 100644
--- a/yolo.cpp
+++ b/SmartCrop/yolo.cpp
@@ -11,8 +11,8 @@
 #define INCBIN_PREFIX r
 #include "incbin.h"
 
-INCTXT(defaultClasses, "../classes.txt");
-INCBIN(defaultModel, "../yolov8x.onnx");
+INCTXT(defaultClasses, WEIGHT_DIR "/classes.txt");
+INCBIN(defaultModel, WEIGHT_DIR "/yolov8x.onnx");
 
 Yolo::Yolo(const std::filesystem::path &onnxModelPath, const cv::Size &modelInputShape,
 		const std::filesystem::path& classesTxtFilePath, bool runWithOCl)
diff --git a/yolo.h b/SmartCrop/yolo.h
similarity index 100%
rename from yolo.h
rename to SmartCrop/yolo.h
diff --git a/classes.txt b/Weights/classes.txt
similarity index 100%
rename from classes.txt
rename to Weights/classes.txt
diff --git a/face_detection_yunet_2023mar.onnx b/Weights/face_detection_yunet_2023mar.onnx
similarity index 100%
rename from face_detection_yunet_2023mar.onnx
rename to Weights/face_detection_yunet_2023mar.onnx
diff --git a/face_recognition_sface_2021dec.onnx b/Weights/face_recognition_sface_2021dec.onnx
similarity index 100%
rename from face_recognition_sface_2021dec.onnx
rename to Weights/face_recognition_sface_2021dec.onnx
diff --git a/yolov8x.onnx b/yolov8x.onnx
deleted file mode 100644
index 812f4be..0000000
Binary files a/yolov8x.onnx and /dev/null differ