Refactored package-structure