more binaries, dir struct. changed