Moved Commands to packages