Added folders where they belong