Changed dependency order
Cleaned up CommandProcessor