restructure fixtures js-controller, response to fixture-PR