udated file structure