refine project structure