Added directory & file structs