Re-organize the project structure