Update import folder structure