Restructure the files, no changes added to the codes