base project structure
merge with remote branch