Re-organize project.