move Model_Directory to Dir
improve filemapper tests