Restructure folder and files.