Got subfolders working