Correction for namespaces after renaming the module
Removed and updated wrongly named namespaces and directories and files