Beaker directory now supports sub-directories