Changed hierarchy to match go recommended