further project divide and some little changes