Better structure with Makefile and XCode project file