Support subdirectories when generating features