Refactoring the commands into the package Command