Refactored to correct the packages golang definitio