Rearranged code and headers

Commit by leighsmith :: r154 /trunk/Calliope/Application/Calliope.xcodeproj/project.pbxproj: (link) Rearranged code and headers