Re-organize the project