Changed some RegEx expressions to permit more dirs