Changed folders' structure