[CLEANUP] Adjust code to CGL and fix small namespace bugs
drwxr-xr-x - typo3