Move website back into the main repo
Name sub-packages more sensibly
Put .godir at top level
Update wercker box