[#985]: Fix missing namespaces and classes folder and contents