Organize to make friendlier to dev setup.