re configure folder structure