fixed file structure change errors