Use subdirectory rather than file prefix