Base project structure with tests
resolved conflict