Now allows subdirectories in rest