Some basic refactorings has been made. NormalizeFolderName method has been implemented.

Some basic refactorings has been made. NormalizeFolderName method has
been implemented.