directory reorg to make supporting chrome and firefox more sane