updated waddle to allow nested segment folders