Rearrange things and get rid of some fancy plugins so it works on github