- Rearranged project structure