some namespace-fixes and renaming of cms-folder
bugfixes