Reorganize the whole project