Added current files & structs