small file name/structure tweak