Setup client controllers renaming. Setup client remaining tests added
Optomized imports