finalized re org of directory