Refactor package and class names to suit extension to Whirr Command architecture