Changed directories and improved programs