Some renaming of folders, files relocation and namespace refactoring.