Restructure the whole projects Part 1