code cleanup
Menu&Config services code refactor
files cleanup
Confing service code update