fixed dir_list issues
added to clean_up_install/fixed it
fixed merge conflict"