Fixing Package Structure