fixed namespaces of moved classes
fixed namespaces of moved classes addded config classes