Change to go oriented output file structure