Renamed dirs to standard OSB layout & retested