folders normalization and doc update