Updated file struct and add classes