refactoring
refactoring, and fixed bug that assumed UBR dir was present in table creation