Some basic refactorings has been made. 

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