restructured so hopefully github pages will work