Directory restructure continued