Directory restructuring complete. Other minor changes as well.