CHANGED file structure and layouts