improved fanout, moved dirs