Rearrange project structure
Rearrange project structure
Add vehicles with tests