Put Vec3 norm and bool hasNormal in better place

No functional changes.