Restructured source files in VS/XCode projects