Refactor and renaming of namespaces and files