Restructure the whole project