Re-organize

Re-organize the projects