now with subdirectories because I am not crazy