Restructured to prepare for automatic generation of the XCode project file.