Restructure go packages
Fix typos