Update to take the new folders added..