Final structure before use and further modifications in project