new changes wiith file structure