modify the UI and the folder structure