Reorganizing so gh pages will work