Command controller got his own dispatcher
Removed empty folder
Usings cleanup