Async & reorganize Go stuff