Commiting code before attempting to remove DirectoryTool code.