Refactored packages: command & operation