Fix build errors caused by prior commit, roll Package into Asset.h/inl/cpp to simplify includes