Directory and TODO update