Restructing go packages