Classroom space has been found for more than 3000 pupils affected by the Edinburgh schools crisis, while uncertainty continues for hundreds of younger children.

A total of 7600 pupils were displaced after the closure of 17 primary and secondary schools last week.

Hundreds of primary, special and S1 to S3 pupils are still unsure when their lessons will resume or where they will be based.

Edinburgh City Council's chief executive has admitted finding alternative accommodation has been a "huge logistical exercise".

All 2000 affected S4, S5 and S6 pupils will be back in school by Thursday after council leaders pledged to make those preparing for exams a priority.

The local authority has also announced alternative arrangements for 1300 pupils from four of the city's primaries but it is still trying to find spaces for the majority of its primary, special and S1 to S3 pupils.

Pupils from Oxgangs and St Peter's, where major structural faults were found last week, returned to school on Wednesday.

They will be taught at temporary classrooms in neighbouring facilities, as per the arrangements before the Easter break when the schools were closed for initial inspections.

Youngsters from Craigroyston Primary will be relocated to Craigroyston Community High on a phased basis from Friday, while those from Castleview Primary will have lessons at Castlebrae High from Tuesday.

Older pupils from Drummond, Firrhill and Royal High returned to their own schools on Wednesday.

Lower year pupils at Drummond will return to the school on Thursday.

Gracemount S4, S5 and S6 pupils went to classes at Liberton High from Wednesday, while senior students from Craigmount will go to Tynecastle High from Thursday.

S3 students from Royal High will return to the school on Thursday, while an update is expected for S1 and S2 pupils later this week.

The school kitchens at Royal High and Drummond are closed, and packed lunches will be provided to pupils who receive free school meals.

The council has pledged to find accommodation for all affected students by Tuesday next week, as Monday is a spring bank holiday.

Chief executive Andrew Kerr said: "Work is continuing to identify alternative options for other primary, special and S1 to S3 pupils which we will communicate to parents as soon as we have further information.

"I fully recognise the significant inconvenience to parents caused by these closures and I want to thank them for their patience as we continue to work through this issue."

A programme of structural surveys arranged by the Edinburgh Schools Partnership is continuing this week.

The 17 schools and two other community buildings were closed on Friday after engineers raised structural concerns.

All of the buildings were built under a Private Finance Initiative project.