Refactored Structure package