Re-organizing Commands. (Not Complete)