BREAKING CHANGE: Refactored packages