Updated to include js subfolders