Beginning project structure
Merging