incorporate new file structure and newest version of included files