Apply 4.3 folder structure