Changed to correct GO package structure

Olav