Changed file structure.