Made command packages more logical