Directory restructure and minor amends