Slight Fixes on Package Structure Change