remove filename extraction and stick with directories