Here is how I do it :
1) Folders named by movie code. If I have many movies from the same studios, I merge them into one.
2) Inside of each movie folder, I split the movie into scenes. Scenes are named by category. Here "cr = creampie", "mouth = cum in mouth" ...
3) I made a simple program that makes you input keywords, and return a .pls file with videos including your keywords.
4) The pls file can be read by any video player.