Directory rearranging and small bug fix to obs cb