ucf file added. directories reorganized