directory restructure, second push of program files