Fixed change of file structure