split project, fix some bugs