[Avida-cvs] [Avida2-svn] r201 - in branches/brysonda: Avida2.xcodeproj source/event source/main source/tools

brysonda@myxo.css.msu.edu brysonda at myxo.css.msu.edu
Fri Jun 10 12:24:17 PDT 2005


Author: brysonda
Date: 2005-06-10 15:24:15 -0400 (Fri, 10 Jun 2005)
New Revision: 201

Added:
   branches/brysonda/source/tools/tObjectFactory.h
Removed:
   branches/brysonda/source/event/population_event.cc
Modified:
   branches/brysonda/Avida2.xcodeproj/project.pbxproj
   branches/brysonda/source/event/event_factory.cc
   branches/brysonda/source/event/event_factory.hh
   branches/brysonda/source/event/event_factory_manager.cc
   branches/brysonda/source/event/event_factory_manager.hh
   branches/brysonda/source/event/event_list.cc
   branches/brysonda/source/event/population_event.hh
   branches/brysonda/source/event/population_event_factory.cc
   branches/brysonda/source/event/population_event_factory.hh
   branches/brysonda/source/main/inst_lib_base.hh
Log:
Begin reworking events loading.  Added tObjectFactory.

Modified: branches/brysonda/Avida2.xcodeproj/project.pbxproj
===================================================================
--- branches/brysonda/Avida2.xcodeproj/project.pbxproj	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/Avida2.xcodeproj/project.pbxproj	2005-06-10 19:24:15 UTC (rev 201)
@@ -3,366 +3,169 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 39;
+	objectVersion = 42;
 	objects = {
-		703F684207B437B800C1CA76 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.xml;
-			path = status.xml;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70486B8C08266CA2009328F0 = {
+
+/* Begin PBXBuildFile section */
+		700E2996085A1F6000CF158A /* primitive in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC3164D07626CF3008F7A48 /* primitive */; };
+		70486BA00826722F009328F0 /* analyze.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC3114B0762539E008F7A48 /* analyze.cfg */; };
+		70486BA10826722F009328F0 /* environment.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311800762539F008F7A48 /* environment.cfg */; };
+		70486BA20826722F009328F0 /* events.cfg in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311810762539F008F7A48 /* events.cfg */; };
+		70486BA30826722F009328F0 /* genesis in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311820762539F008F7A48 /* genesis */; };
+		70486BA40826722F009328F0 /* genesis.4stack in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311830762539F008F7A48 /* genesis.4stack */; };
+		70486BA50826722F009328F0 /* inst_set.4stack in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311840762539F008F7A48 /* inst_set.4stack */; };
+		70486BA60826722F009328F0 /* inst_set.default in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311850762539F008F7A48 /* inst_set.default */; };
+		70486BA70826722F009328F0 /* organism.default in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311890762539F008F7A48 /* organism.default */; };
+		706D3157085243CD00D7DC8F /* head_cpu.cc in Sources */ = {isa = PBXBuildFile; fileRef = 706D3155085243CD00D7DC8F /* head_cpu.cc */; };
+		706D3158085243CD00D7DC8F /* head_cpu.hh in CopyFiles */ = {isa = PBXBuildFile; fileRef = 706D3156085243CD00D7DC8F /* head_cpu.hh */; };
+		706D31650852475D00D7DC8F /* hardware_smt_thread.cc in Sources */ = {isa = PBXBuildFile; fileRef = 706D31000852366400D7DC8F /* hardware_smt_thread.cc */; };
+		706D31660852475E00D7DC8F /* hardware_smt.cc in Sources */ = {isa = PBXBuildFile; fileRef = 706D30FC0852363400D7DC8F /* hardware_smt.cc */; };
+		706D32E90854A39800D7DC8F /* dummy in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311950762539F008F7A48 /* dummy */; };
+		706D32EA0854A39900D7DC8F /* organism.4stack in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311970762539F008F7A48 /* organism.4stack */; };
+		706D32EB0854A39900D7DC8F /* organism.parasite in CopyFiles */ = {isa = PBXBuildFile; fileRef = DCC311980762539F008F7A48 /* organism.parasite */; };
+		706D330F0854A7B900D7DC8F /* organism.smt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 706D330E0854A7B900D7DC8F /* organism.smt */; };
+		706D33110854A7D700D7DC8F /* genesis.smt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 706D33100854A7D700D7DC8F /* genesis.smt */; };
+		706D33280854A90D00D7DC8F /* inst_set.smt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 706D33270854A90D00D7DC8F /* inst_set.smt */; };
+		70CBFCEE0815E7FE0078D8CC /* hardware_status_printer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CBFCE80815E7FE0078D8CC /* hardware_status_printer.cc */; };
+		70CBFCF10815E8370078D8CC /* change_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = 70CBFCEF0815E8370078D8CC /* change_list.cc */; };
+		DCC3165007626D40008F7A48 /* primitive.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311090762539E008F7A48 /* primitive.cc */; };
+		DCC3165F0762852D008F7A48 /* analyze_genotype.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310980762539E008F7A48 /* analyze_genotype.cc */; };
+		DCC316600762852F008F7A48 /* analyze_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109A0762539E008F7A48 /* analyze_util.cc */; };
+		DCC3166107628531008F7A48 /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
+		DCC3166207628532008F7A48 /* avida_driver_analyze.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109E0762539E008F7A48 /* avida_driver_analyze.cc */; };
+		DCC3166307628533008F7A48 /* avida_driver_base.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310A00762539E008F7A48 /* avida_driver_base.cc */; };
+		DCC3166407628534008F7A48 /* avida_driver_population.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310A20762539E008F7A48 /* avida_driver_population.cc */; };
+		DCC3166507628535008F7A48 /* birth_chamber.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310A50762539E008F7A48 /* birth_chamber.cc */; };
+		DCC3166607628536008F7A48 /* callback_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310A70762539E008F7A48 /* callback_util.cc */; };
+		DCC3166707628537008F7A48 /* config.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310AA0762539E008F7A48 /* config.cc */; };
+		DCC3166807628538008F7A48 /* environment.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310AC0762539E008F7A48 /* environment.cc */; };
+		DCC3166907628539008F7A48 /* fitness_matrix.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310AE0762539E008F7A48 /* fitness_matrix.cc */; };
+		DCC3166A0762853A008F7A48 /* genebank.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310C50762539E008F7A48 /* genebank.cc */; };
+		DCC3166B0762853B008F7A48 /* genome.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310C70762539E008F7A48 /* genome.cc */; };
+		DCC3166C0762853D008F7A48 /* genome_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310C90762539E008F7A48 /* genome_util.cc */; };
+		DCC3166D0762853E008F7A48 /* genotype.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310CB0762539E008F7A48 /* genotype.cc */; };
+		DCC3166E0762853F008F7A48 /* genotype_birth_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310CE0762539E008F7A48 /* genotype_birth_data.cc */; };
+		DCC3166F07628559008F7A48 /* analyze.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310900762539E008F7A48 /* analyze.cc */; };
+		DCC316700762855C008F7A48 /* genotype_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310D00762539E008F7A48 /* genotype_control.cc */; };
+		DCC316710762855D008F7A48 /* genotype_test_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310D30762539E008F7A48 /* genotype_test_data.cc */; };
+		DCC316720762855E008F7A48 /* inject_genebank.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310D50762539E008F7A48 /* inject_genebank.cc */; };
+		DCC316730762855F008F7A48 /* inject_genotype.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310D80762539E008F7A48 /* inject_genotype.cc */; };
+		DCC316740762855F008F7A48 /* inject_genotype_birth_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310DA0762539E008F7A48 /* inject_genotype_birth_data.cc */; };
+		DCC3167507628560008F7A48 /* inject_genotype_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310DC0762539E008F7A48 /* inject_genotype_control.cc */; };
+		DCC3167607628563008F7A48 /* inject_genotype_queue.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310DF0762539E008F7A48 /* inject_genotype_queue.cc */; };
+		DCC3167707628565008F7A48 /* inst_set.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310E20762539E008F7A48 /* inst_set.cc */; };
+		DCC3167807628566008F7A48 /* inst_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310E40762539E008F7A48 /* inst_util.cc */; };
+		DCC3167907628567008F7A48 /* instruction.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310E60762539E008F7A48 /* instruction.cc */; };
+		DCC3167A07628567008F7A48 /* landscape.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310E80762539E008F7A48 /* landscape.cc */; };
+		DCC3167B07628568008F7A48 /* lineage.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310EA0762539E008F7A48 /* lineage.cc */; };
+		DCC3167C07628569008F7A48 /* lineage_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310EC0762539E008F7A48 /* lineage_control.cc */; };
+		DCC3167D07628569008F7A48 /* local_mutations.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310EE0762539E008F7A48 /* local_mutations.cc */; };
+		DCC3167E0762856C008F7A48 /* mutation.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310F30762539E008F7A48 /* mutation.cc */; };
+		DCC3167F0762856C008F7A48 /* mutation_lib.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310F50762539E008F7A48 /* mutation_lib.cc */; };
+		DCC316800762856D008F7A48 /* mutation_rates.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310F80762539E008F7A48 /* mutation_rates.cc */; };
+		DCC316810762856E008F7A48 /* mx_code_array.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310FA0762539E008F7A48 /* mx_code_array.cc */; };
+		DCC316820762856F008F7A48 /* org_message.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310FD0762539E008F7A48 /* org_message.cc */; };
+		DCC3168307628570008F7A48 /* organism.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310FF0762539E008F7A48 /* organism.cc */; };
+		DCC3168407628571008F7A48 /* phenotype.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311010762539E008F7A48 /* phenotype.cc */; };
+		DCC3168507628572008F7A48 /* population.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311030762539E008F7A48 /* population.cc */; };
+		DCC3168607628573008F7A48 /* population_interface.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311070762539E008F7A48 /* population_interface.cc */; };
+		DCC3168707628574008F7A48 /* population_cell.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311050762539E008F7A48 /* population_cell.cc */; };
+		DCC3168807628577008F7A48 /* reaction.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3110B0762539E008F7A48 /* reaction.cc */; };
+		DCC3168907628578008F7A48 /* reaction_lib.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3110D0762539E008F7A48 /* reaction_lib.cc */; };
+		DCC3168A0762857A008F7A48 /* reaction_process.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311100762539E008F7A48 /* reaction_process.cc */; };
+		DCC3168B0762857A008F7A48 /* reaction_requisite.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311120762539E008F7A48 /* reaction_requisite.cc */; };
+		DCC3168C0762857B008F7A48 /* reaction_result.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311140762539E008F7A48 /* reaction_result.cc */; };
+		DCC3168D0762857C008F7A48 /* resource.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311160762539E008F7A48 /* resource.cc */; };
+		DCC3168E0762857D008F7A48 /* resource_count.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311180762539E008F7A48 /* resource_count.cc */; };
+		DCC3168F0762857F008F7A48 /* resource_lib.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3111B0762539E008F7A48 /* resource_lib.cc */; };
+		DCC316900762857F008F7A48 /* spatial_count_elem.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3111E0762539E008F7A48 /* spatial_count_elem.cc */; };
+		DCC3169107628580008F7A48 /* spatial_res_count.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311200762539E008F7A48 /* spatial_res_count.cc */; };
+		DCC3169207628581008F7A48 /* species.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311220762539E008F7A48 /* species.cc */; };
+		DCC3169307628582008F7A48 /* species_control.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311240762539E008F7A48 /* species_control.cc */; };
+		DCC3169407628583008F7A48 /* species_queue.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311260762539E008F7A48 /* species_queue.cc */; };
+		DCC3169507628584008F7A48 /* stats.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC311280762539E008F7A48 /* stats.cc */; };
+		DCC3169607628585008F7A48 /* task_entry.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3112A0762539E008F7A48 /* task_entry.cc */; };
+		DCC3169707628585008F7A48 /* task_lib.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3112C0762539E008F7A48 /* task_lib.cc */; };
+		DCC316980762858C008F7A48 /* event.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FEE0762539D008F7A48 /* event.cc */; };
+		DCC316990762858D008F7A48 /* event_factory.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FF10762539D008F7A48 /* event_factory.cc */; };
+		DCC3169A0762858E008F7A48 /* event_factory_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FF30762539D008F7A48 /* event_factory_manager.cc */; };
+		DCC3169B0762858F008F7A48 /* event_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FF50762539D008F7A48 /* event_list.cc */; };
+		DCC3169D076285C4008F7A48 /* event_list_entry.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FF70762539D008F7A48 /* event_list_entry.cc */; };
+		DCC3169E076285C5008F7A48 /* event_list_iterator.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FF90762539D008F7A48 /* event_list_iterator.cc */; };
+		DCC3169F076285C6008F7A48 /* event_triggers.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FFB0762539D008F7A48 /* event_triggers.cc */; };
+		DCC316A1076285C8008F7A48 /* population_event_factory.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC310010762539D008F7A48 /* population_event_factory.cc */; };
+		DCC316A2076285D1008F7A48 /* head_multi_mem.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FA70762539D008F7A48 /* head_multi_mem.cc */; };
+		DCC316A3076285D2008F7A48 /* code_label.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FAA0762539D008F7A48 /* code_label.cc */; };
+		DCC316A5076285D5008F7A48 /* cpu_memory.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FB00762539D008F7A48 /* cpu_memory.cc */; };
+		DCC316A6076285D5008F7A48 /* cpu_stack.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FB20762539D008F7A48 /* cpu_stack.cc */; };
+		DCC316A7076285D6008F7A48 /* cpu_test_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FB50762539D008F7A48 /* cpu_test_info.cc */; };
+		DCC316A8076285D7008F7A48 /* hardware_4stack.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FB70762539D008F7A48 /* hardware_4stack.cc */; };
+		DCC316A9076285D8008F7A48 /* hardware_4stack_thread.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FBA0762539D008F7A48 /* hardware_4stack_thread.cc */; };
+		DCC316AA076285D9008F7A48 /* hardware_base.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FBC0762539D008F7A48 /* hardware_base.cc */; };
+		DCC316AB076285DA008F7A48 /* hardware_cpu.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FBE0762539D008F7A48 /* hardware_cpu.cc */; };
+		DCC316AC076285DB008F7A48 /* hardware_cpu_thread.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FC00762539D008F7A48 /* hardware_cpu_thread.cc */; };
+		DCC316AD076285DC008F7A48 /* hardware_factory.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FC20762539D008F7A48 /* hardware_factory.cc */; };
+		DCC316AE076285DD008F7A48 /* hardware_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FC40762539D008F7A48 /* hardware_util.cc */; };
+		DCC316AF076285DF008F7A48 /* memory_flags.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FC80762539D008F7A48 /* memory_flags.cc */; };
+		DCC316B0076285DF008F7A48 /* test_cpu.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FCA0762539D008F7A48 /* test_cpu.cc */; };
+		DCC316B1076285E0008F7A48 /* test_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC30FCC0762539D008F7A48 /* test_util.cc */; };
+		DCC316B507628724008F7A48 /* trio.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC3146D076253A1008F7A48 /* trio.c */; };
+		DCC316B607628726008F7A48 /* trionan.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31471076253A1008F7A48 /* trionan.c */; };
+		DCC316B707628728008F7A48 /* triostr.c in Sources */ = {isa = PBXBuildFile; fileRef = DCC31474076253A1008F7A48 /* triostr.c */; };
+		DCC316B807628742008F7A48 /* weighted_index.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315B3076253A5008F7A48 /* weighted_index.cc */; };
+		DCC316B907628744008F7A48 /* tools.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC315AA076253A4008F7A48 /* tools.cc */; };
+		DCC316BA07628749008F7A48 /* block_struct.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31545076253A4008F7A48 /* block_struct.cc */; };
+		DCC316BB0762874A008F7A48 /* cCycleCheck.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31547076253A4008F7A48 /* cCycleCheck.cc */; };
+		DCC316BC0762874B008F7A48 /* const_schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154B076253A4008F7A48 /* const_schedule.cc */; };
+		DCC316BD0762874C008F7A48 /* count_tracker.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3154D076253A4008F7A48 /* count_tracker.cc */; };
+		DCC316BE0762874D008F7A48 /* data_entry.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31550076253A4008F7A48 /* data_entry.cc */; };
+		DCC316BF0762874E008F7A48 /* data_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31552076253A4008F7A48 /* data_file.cc */; };
+		DCC316C00762874F008F7A48 /* data_file_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31554076253A4008F7A48 /* data_file_manager.cc */; };
+		DCC316C107628750008F7A48 /* data_manager_base.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31556076253A4008F7A48 /* data_manager_base.cc */; };
+		DCC316C207628751008F7A48 /* default_message_display.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31558076253A4008F7A48 /* default_message_display.cc */; };
+		DCC316C307628752008F7A48 /* double_sum.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155A076253A4008F7A48 /* double_sum.cc */; };
+		DCC316C407628753008F7A48 /* file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155C076253A4008F7A48 /* file.cc */; };
+		DCC316C507628754008F7A48 /* fixed_block.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3155E076253A4008F7A48 /* fixed_block.cc */; };
+		DCC316C607628755008F7A48 /* genesis.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31562076253A4008F7A48 /* genesis.cc */; };
+		DCC316C707628757008F7A48 /* help_alias.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31564076253A4008F7A48 /* help_alias.cc */; };
+		DCC316C807628758008F7A48 /* help_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31568076253A4008F7A48 /* help_manager.cc */; };
+		DCC316C90762875A008F7A48 /* help_type.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3156A076253A4008F7A48 /* help_type.cc */; };
+		DCC316CA0762875B008F7A48 /* histogram.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3156C076253A4008F7A48 /* histogram.cc */; };
+		DCC316CB0762875C008F7A48 /* indexed_block_struct.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3156E076253A4008F7A48 /* indexed_block_struct.cc */; };
+		DCC316CC0762875D008F7A48 /* init_file.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31570076253A4008F7A48 /* init_file.cc */; };
+		DCC316CD0762875D008F7A48 /* int_sum.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31572076253A4008F7A48 /* int_sum.cc */; };
+		DCC316CE0762875E008F7A48 /* integrated_schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31574076253A4008F7A48 /* integrated_schedule.cc */; };
+		DCC316CF0762875F008F7A48 /* integrated_schedule_node.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31576076253A4008F7A48 /* integrated_schedule_node.cc */; };
+		DCC316D007628761008F7A48 /* merit.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31579076253A4008F7A48 /* merit.cc */; };
+		DCC316D107628763008F7A48 /* message_display.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3157D076253A4008F7A48 /* message_display.cc */; };
+		DCC316D207628764008F7A48 /* prob_schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31581076253A4008F7A48 /* prob_schedule.cc */; };
+		DCC316D307628765008F7A48 /* random.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31583076253A4008F7A48 /* random.cc */; };
+		DCC316D407628766008F7A48 /* ref_block.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31588076253A4008F7A48 /* ref_block.cc */; };
+		DCC316D507628767008F7A48 /* running_average.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3158A076253A4008F7A48 /* running_average.cc */; };
+		DCC316D607628769008F7A48 /* scaled_block.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3158C076253A4008F7A48 /* scaled_block.cc */; };
+		DCC316D70762876A008F7A48 /* schedule.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3158E076253A4008F7A48 /* schedule.cc */; };
+		DCC316D80762876B008F7A48 /* string.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31590076253A4008F7A48 /* string.cc */; };
+		DCC316D90762876C008F7A48 /* string_iterator.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31592076253A4008F7A48 /* string_iterator.cc */; };
+		DCC316DA0762876E008F7A48 /* string_list.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31594076253A4008F7A48 /* string_list.cc */; };
+		DCC316DB0762876F008F7A48 /* string_util.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC31596076253A4008F7A48 /* string_util.cc */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildStyle section */
+		70486B8C08266CA2009328F0 /* Profile */ = {
+			isa = PBXBuildStyle;
 			buildSettings = {
 				GCC_OPTIMIZATION_LEVEL = 3;
 			};
-			isa = PBXBuildStyle;
 			name = Profile;
 		};
-		70486B9508267145009328F0 = {
-			buildActionMask = 2147483647;
-			dstPath = work;
-			dstSubfolderSpec = 16;
-			files = (
-				70486BA00826722F009328F0,
-				70486BA10826722F009328F0,
-				70486BA20826722F009328F0,
-				70486BA30826722F009328F0,
-				70486BA40826722F009328F0,
-				70486BA50826722F009328F0,
-				70486BA60826722F009328F0,
-				70486BA70826722F009328F0,
-				706D3158085243CD00D7DC8F,
-				706D32E90854A39800D7DC8F,
-				706D32EA0854A39900D7DC8F,
-				706D32EB0854A39900D7DC8F,
-				706D330F0854A7B900D7DC8F,
-				706D33110854A7D700D7DC8F,
-				706D33280854A90D00D7DC8F,
-			);
-			isa = PBXCopyFilesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		70486BA00826722F009328F0 = {
-			fileRef = DCC3114B0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA10826722F009328F0 = {
-			fileRef = DCC311800762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA20826722F009328F0 = {
-			fileRef = DCC311810762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA30826722F009328F0 = {
-			fileRef = DCC311820762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA40826722F009328F0 = {
-			fileRef = DCC311830762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA50826722F009328F0 = {
-			fileRef = DCC311840762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA60826722F009328F0 = {
-			fileRef = DCC311850762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70486BA70826722F009328F0 = {
-			fileRef = DCC311890762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D30CC0852328F00D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = tInstLib.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D30FB0852363400D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = hardware_smt.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D30FC0852363400D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_smt.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D30FF0852366400D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = hardware_smt_thread.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D31000852366400D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_smt_thread.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D3155085243CD00D7DC8F = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = head_cpu.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D3156085243CD00D7DC8F = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = head_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D3157085243CD00D7DC8F = {
-			fileRef = 706D3155085243CD00D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D3158085243CD00D7DC8F = {
-			fileRef = 706D3156085243CD00D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D31650852475D00D7DC8F = {
-			fileRef = 706D31000852366400D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D31660852475E00D7DC8F = {
-			fileRef = 706D30FC0852363400D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D3170085248F800D7DC8F = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = hardware_smt_constants.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D32E90854A39800D7DC8F = {
-			fileRef = DCC311950762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D32EA0854A39900D7DC8F = {
-			fileRef = DCC311970762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D32EB0854A39900D7DC8F = {
-			fileRef = DCC311980762539F008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D330E0854A7B900D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.smt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D330F0854A7B900D7DC8F = {
-			fileRef = 706D330E0854A7B900D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D33100854A7D700D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis.smt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D33110854A7D700D7DC8F = {
-			fileRef = 706D33100854A7D700D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		706D33270854A90D00D7DC8F = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.smt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		706D33280854A90D00D7DC8F = {
-			fileRef = 706D33270854A90D00D7DC8F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70CBFCE80815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_status_printer.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCE90815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_status_printer.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCEA0815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_tracer_4stack.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCEB0815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_tracer_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCEC0815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_tracer_test_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCED0815E7FE0078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_tracer.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCEE0815E7FE0078D8CC = {
-			fileRef = 70CBFCE80815E7FE0078D8CC;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		70CBFCEF0815E8370078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = change_list.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCF00815E8370078D8CC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = change_list.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		70CBFCF10815E8370078D8CC = {
-			fileRef = 70CBFCEF0815E8370078D8CC;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//700
-//701
-//702
-//703
-//704
-//DC0
-//DC1
-//DC2
-//DC3
-//DC4
-		DCBB56590763EA7F00FA9C7E = {
-			buildActionMask = 2147483647;
-			comments = "This is a hackish way to get the system to build the auto-generated code before compiling the rest of the system.";
-			files = (
-			);
-			inputPaths = (
-			);
-			isa = PBXShellScriptBuildPhase;
-			outputPaths = (
-				"$(DERIVED_FILES_DIR)/cPopulation_construct_event_auto.ci",
-				"$(DERIVED_FILES_DIR)/cPopulation_descr.ci",
-				"$(DERIVED_FILES_DIR)/cPopulation_descr.hi",
-				"$(DERIVED_FILES_DIR)/cPopulation_enums_auto.ci",
-				"$(DERIVED_FILES_DIR)/cPopulation_name2enum_auto.ci",
-				"$(DERIVED_FILES_DIR)/cPopulation_process_auto.ci",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "perl source/event/make_events.pl -x[source/event/cPopulation][$DERIVED_FILES_DIR]";
-		};
-		DCC30C490762532C008F7A48 = {
-			children = (
-				703F684207B437B800C1CA76,
-				DCC30C670762539A008F7A48,
-				DCC3164E07626CF3008F7A48,
-			);
-			isa = PBXGroup;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30C4B0762532C008F7A48 = {
+		DCC30C4B0762532C008F7A48 /* Development */ = {
+			isa = PBXBuildStyle;
 			buildSettings = {
 			};
-			isa = PBXBuildStyle;
 			name = Development;
 		};
-		DCC30C4C0762532C008F7A48 = {
+		DCC30C4C0762532C008F7A48 /* Deployment */ = {
+			isa = PBXBuildStyle;
 			buildSettings = {
 				COPY_PHASE_STRIP = YES;
 				DEAD_CODE_STRIPPING = YES;
@@ -370,9270 +173,2653 @@
 				GCC_OPTIMIZATION_LEVEL = 3;
 				ZERO_LINK = NO;
 			};
-			isa = PBXBuildStyle;
 			name = Deployment;
 		};
-		DCC30C4D0762532C008F7A48 = {
-			buildSettings = {
-			};
-			buildStyles = (
-				DCC30C4B0762532C008F7A48,
-				DCC30C4C0762532C008F7A48,
-				70486B8C08266CA2009328F0,
+/* End PBXBuildStyle section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		70486B9508267145009328F0 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = Avida2.work;
+			dstSubfolderSpec = 16;
+			files = (
+				700E2996085A1F6000CF158A /* primitive in CopyFiles */,
+				70486BA00826722F009328F0 /* analyze.cfg in CopyFiles */,
+				70486BA10826722F009328F0 /* environment.cfg in CopyFiles */,
+				70486BA20826722F009328F0 /* events.cfg in CopyFiles */,
+				70486BA30826722F009328F0 /* genesis in CopyFiles */,
+				70486BA40826722F009328F0 /* genesis.4stack in CopyFiles */,
+				70486BA50826722F009328F0 /* inst_set.4stack in CopyFiles */,
+				70486BA60826722F009328F0 /* inst_set.default in CopyFiles */,
+				70486BA70826722F009328F0 /* organism.default in CopyFiles */,
+				706D3158085243CD00D7DC8F /* head_cpu.hh in CopyFiles */,
+				706D32E90854A39800D7DC8F /* dummy in CopyFiles */,
+				706D32EA0854A39900D7DC8F /* organism.4stack in CopyFiles */,
+				706D32EB0854A39900D7DC8F /* organism.parasite in CopyFiles */,
+				706D330F0854A7B900D7DC8F /* organism.smt in CopyFiles */,
+				706D33110854A7D700D7DC8F /* genesis.smt in CopyFiles */,
+				706D33280854A90D00D7DC8F /* inst_set.smt in CopyFiles */,
 			);
-			hasScannedForEncodings = 0;
-			isa = PBXProject;
-			mainGroup = DCC30C490762532C008F7A48;
-			productRefGroup = DCC3164E07626CF3008F7A48;
-			projectDirPath = "";
-			targets = (
-				DCC3164C07626CF3008F7A48,
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		700E28CF0859FFD700CF158A /* tObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tObjectFactory.h; sourceTree = "<group>"; };
+		703F684207B437B800C1CA76 /* status.xml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = status.xml; sourceTree = "<group>"; };
+		706D30CC0852328F00D7DC8F /* tInstLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tInstLib.h; sourceTree = "<group>"; };
+		706D30FB0852363400D7DC8F /* hardware_smt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hardware_smt.h; sourceTree = "<group>"; };
+		706D30FC0852363400D7DC8F /* hardware_smt.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_smt.cc; sourceTree = "<group>"; };
+		706D30FF0852366400D7DC8F /* hardware_smt_thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hardware_smt_thread.h; sourceTree = "<group>"; };
+		706D31000852366400D7DC8F /* hardware_smt_thread.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_smt_thread.cc; sourceTree = "<group>"; };
+		706D3155085243CD00D7DC8F /* head_cpu.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = head_cpu.cc; sourceTree = "<group>"; };
+		706D3156085243CD00D7DC8F /* head_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = head_cpu.hh; sourceTree = "<group>"; };
+		706D3170085248F800D7DC8F /* hardware_smt_constants.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hardware_smt_constants.h; sourceTree = "<group>"; };
+		706D330E0854A7B900D7DC8F /* organism.smt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = organism.smt; sourceTree = "<group>"; };
+		706D33100854A7D700D7DC8F /* genesis.smt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = genesis.smt; sourceTree = "<group>"; };
+		706D33270854A90D00D7DC8F /* inst_set.smt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = inst_set.smt; sourceTree = "<group>"; };
+		70CBFCE80815E7FE0078D8CC /* hardware_status_printer.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_status_printer.cc; sourceTree = "<group>"; };
+		70CBFCE90815E7FE0078D8CC /* hardware_status_printer.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_status_printer.hh; sourceTree = "<group>"; };
+		70CBFCEA0815E7FE0078D8CC /* hardware_tracer_4stack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_tracer_4stack.hh; sourceTree = "<group>"; };
+		70CBFCEB0815E7FE0078D8CC /* hardware_tracer_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_tracer_cpu.hh; sourceTree = "<group>"; };
+		70CBFCEC0815E7FE0078D8CC /* hardware_tracer_test_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_tracer_test_cpu.hh; sourceTree = "<group>"; };
+		70CBFCED0815E7FE0078D8CC /* hardware_tracer.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_tracer.hh; sourceTree = "<group>"; };
+		70CBFCEF0815E8370078D8CC /* change_list.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = change_list.cc; sourceTree = "<group>"; };
+		70CBFCF00815E8370078D8CC /* change_list.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = change_list.hh; sourceTree = "<group>"; };
+		DCC30D300762539B008F7A48 /* 4stack_head.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = 4stack_head.pyste; sourceTree = "<group>"; };
+		DCC30D310762539B008F7A48 /* A.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = A.hh; sourceTree = "<group>"; };
+		DCC30D320762539B008F7A48 /* A.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = A.pyste; sourceTree = "<group>"; };
+		DCC30D330762539B008F7A48 /* AB.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AB.cc; sourceTree = "<group>"; };
+		DCC30D340762539B008F7A48 /* analyze.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.pyste; sourceTree = "<group>"; };
+		DCC30D350762539B008F7A48 /* analyze_command.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_command.pyste; sourceTree = "<group>"; };
+		DCC30D360762539B008F7A48 /* analyze_command_def.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_command_def.pyste; sourceTree = "<group>"; };
+		DCC30D370762539B008F7A48 /* analyze_command_def_base.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_command_def_base.pyste; sourceTree = "<group>"; };
+		DCC30D380762539B008F7A48 /* analyze_flow_command.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_flow_command.pyste; sourceTree = "<group>"; };
+		DCC30D390762539B008F7A48 /* analyze_flow_command_def.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_flow_command_def.pyste; sourceTree = "<group>"; };
+		DCC30D3A0762539B008F7A48 /* analyze_function.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_function.pyste; sourceTree = "<group>"; };
+		DCC30D3B0762539B008F7A48 /* analyze_genotype.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_genotype.pyste; sourceTree = "<group>"; };
+		DCC30D3C0762539B008F7A48 /* analyze_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze_util.pyste; sourceTree = "<group>"; };
+		DCC30D3D0762539B008F7A48 /* avida-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "avida-fixups.hh"; sourceTree = "<group>"; };
+		DCC30D3E0762539B008F7A48 /* avida.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = avida.pyste; sourceTree = "<group>"; };
+		DCC30D3F0762539B008F7A48 /* avida_driver_analyze.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = avida_driver_analyze.pyste; sourceTree = "<group>"; };
+		DCC30D400762539B008F7A48 /* avida_driver_base.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = avida_driver_base.pyste; sourceTree = "<group>"; };
+		DCC30D410762539B008F7A48 /* avida_driver_population.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = avida_driver_population.pyste; sourceTree = "<group>"; };
+		DCC30D420762539B008F7A48 /* avida_triggers.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = avida_triggers.pyste; sourceTree = "<group>"; };
+		DCC30D670762539B008F7A48 /* __init__.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = __init__.py; sourceTree = "<group>"; };
+		DCC30D680762539B008F7A48 /* buildapp.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = buildapp.py; sourceTree = "<group>"; };
+		DCC30D690762539B008F7A48 /* FunctionalTest_recursive_tests.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = FunctionalTest_recursive_tests.py; sourceTree = "<group>"; };
+		DCC30D6A0762539B008F7A48 /* py_avida_core_data.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_avida_core_data.py; sourceTree = "<group>"; };
+		DCC30D6B0762539B008F7A48 /* py_avida_driver_controller.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_avida_driver_controller.py; sourceTree = "<group>"; };
+		DCC30D6C0762539B008F7A48 /* py_avida_state_mediator.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_avida_state_mediator.py; sourceTree = "<group>"; };
+		DCC30D6D0762539B008F7A48 /* py_avida_threaded_driver.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_avida_threaded_driver.py; sourceTree = "<group>"; };
+		DCC30D6E0762539B008F7A48 /* py_brainstorms.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_brainstorms.py; sourceTree = "<group>"; };
+		DCC30D6F0762539B008F7A48 /* py_main_controller_data.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_main_controller_data.py; sourceTree = "<group>"; };
+		DCC30D700762539B008F7A48 /* pyEduMainCtrl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = pyEduMainCtrl.py; sourceTree = "<group>"; };
+		DCC30D710762539B008F7A48 /* pyMdl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = pyMdl.py; sourceTree = "<group>"; };
+		DCC30D720762539B008F7A48 /* pySessionCtrl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = pySessionCtrl.py; sourceTree = "<group>"; };
+		DCC30D730762539B008F7A48 /* pySessionCtrl.py.1 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.man; path = pySessionCtrl.py.1; sourceTree = "<group>"; };
+		DCC30D740762539B008F7A48 /* pySessionDumbCtrl.py.1 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.man; path = pySessionDumbCtrl.py.1; sourceTree = "<group>"; };
+		DCC30D750762539B008F7A48 /* pySessionWorkThreadHdlr.py.0 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = pySessionWorkThreadHdlr.py.0; sourceTree = "<group>"; };
+		DCC30D760762539B008F7A48 /* pySessionWorkThreadHdlr.py.1 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.man; path = pySessionWorkThreadHdlr.py.1; sourceTree = "<group>"; };
+		DCC30D770762539B008F7A48 /* pyTemporaryReloads.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = pyTemporaryReloads.py; sourceTree = "<group>"; };
+		DCC30D780762539B008F7A48 /* UnitTest_pyAvidaCoreData.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyAvidaCoreData.py; sourceTree = "<group>"; };
+		DCC30D790762539B008F7A48 /* UnitTest_pyAvidaThreadedDriver.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyAvidaThreadedDriver.py; sourceTree = "<group>"; };
+		DCC30D7A0762539B008F7A48 /* UnitTest_pyEduMainCtrl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyEduMainCtrl.py; sourceTree = "<group>"; };
+		DCC30D7B0762539B008F7A48 /* UnitTest_pyEduMainMenuBarHdlr.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyEduMainMenuBarHdlr.py; sourceTree = "<group>"; };
+		DCC30D7C0762539B008F7A48 /* UnitTest_pyEduSessionMenuBarHdlr.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyEduSessionMenuBarHdlr.py; sourceTree = "<group>"; };
+		DCC30D7D0762539B008F7A48 /* UnitTest_pyMainControllerFactory.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyMainControllerFactory.py; sourceTree = "<group>"; };
+		DCC30D7E0762539B008F7A48 /* UnitTest_pyMdl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyMdl.py; sourceTree = "<group>"; };
+		DCC30D7F0762539B008F7A48 /* UnitTest_pyMdtr.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pyMdtr.py; sourceTree = "<group>"; };
+		DCC30D800762539B008F7A48 /* UnitTest_pySessionControllerFactory.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pySessionControllerFactory.py; sourceTree = "<group>"; };
+		DCC30D810762539B008F7A48 /* UnitTest_pySessionCtrl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pySessionCtrl.py; sourceTree = "<group>"; };
+		DCC30D820762539B008F7A48 /* UnitTest_pySessionDumbCtrl.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pySessionDumbCtrl.py; sourceTree = "<group>"; };
+		DCC30D830762539B008F7A48 /* UnitTest_pySessionDumbView.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pySessionDumbView.py; sourceTree = "<group>"; };
+		DCC30D840762539B008F7A48 /* UnitTest_pySessionWorkThreadHdlr.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = UnitTest_pySessionWorkThreadHdlr.py; sourceTree = "<group>"; };
+		DCC30ED70762539D008F7A48 /* B.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = B.hh; sourceTree = "<group>"; };
+		DCC30ED80762539D008F7A48 /* B.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = B.pyste; sourceTree = "<group>"; };
+		DCC30ED90762539D008F7A48 /* birth_chamber.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = birth_chamber.pyste; sourceTree = "<group>"; };
+		DCC30EDA0762539D008F7A48 /* block_struct.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = block_struct.pyste; sourceTree = "<group>"; };
+		DCC30EDE0762539D008F7A48 /* callback_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = callback_util.pyste; sourceTree = "<group>"; };
+		DCC30EDF0762539D008F7A48 /* cCycleCheck.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cCycleCheck.pyste; sourceTree = "<group>"; };
+		DCC30EE00762539D008F7A48 /* cID.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cID.pyste; sourceTree = "<group>"; };
+		DCC30EE10762539D008F7A48 /* cmake_entries */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cmake_entries; sourceTree = "<group>"; };
+		DCC30EE20762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC30EE30762539D008F7A48 /* code_label.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = code_label.pyste; sourceTree = "<group>"; };
+		DCC30EE40762539D008F7A48 /* config.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = config.pyste; sourceTree = "<group>"; };
+		DCC30EE50762539D008F7A48 /* const_schedule.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = const_schedule.pyste; sourceTree = "<group>"; };
+		DCC30EE60762539D008F7A48 /* count_tracker.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = count_tracker.pyste; sourceTree = "<group>"; };
+		DCC30EE70762539D008F7A48 /* cpu_head.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu_head.pyste; sourceTree = "<group>"; };
+		DCC30EE80762539D008F7A48 /* cpu_memory.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu_memory.pyste; sourceTree = "<group>"; };
+		DCC30EE90762539D008F7A48 /* cpu_stack.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu_stack.pyste; sourceTree = "<group>"; };
+		DCC30EEA0762539D008F7A48 /* cpu_stats.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu_stats.pyste; sourceTree = "<group>"; };
+		DCC30EEB0762539D008F7A48 /* cpu_test_info.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu_test_info.pyste; sourceTree = "<group>"; };
+		DCC30EEC0762539D008F7A48 /* cStringable.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cStringable.pyste; sourceTree = "<group>"; };
+		DCC30EED0762539D008F7A48 /* cTestCase.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cTestCase.pyste; sourceTree = "<group>"; };
+		DCC30EEE0762539D008F7A48 /* cTestProblem.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cTestProblem.pyste; sourceTree = "<group>"; };
+		DCC30EEF0762539D008F7A48 /* cTestResult.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cTestResult.pyste; sourceTree = "<group>"; };
+		DCC30EF00762539D008F7A48 /* cTextTestInterpreter.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cTextTestInterpreter.pyste; sourceTree = "<group>"; };
+		DCC30EF10762539D008F7A48 /* data_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = data_entry.pyste; sourceTree = "<group>"; };
+		DCC30EF20762539D008F7A48 /* data_file.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = data_file.pyste; sourceTree = "<group>"; };
+		DCC30EF30762539D008F7A48 /* data_file_manager.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = data_file_manager.pyste; sourceTree = "<group>"; };
+		DCC30EF40762539D008F7A48 /* data_manager_base.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = data_manager_base.pyste; sourceTree = "<group>"; };
+		DCC30EF50762539D008F7A48 /* double_sum.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = double_sum.pyste; sourceTree = "<group>"; };
+		DCC30EF60762539D008F7A48 /* environment.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.pyste; sourceTree = "<group>"; };
+		DCC30EF70762539D008F7A48 /* event.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event.pyste; sourceTree = "<group>"; };
+		DCC30EF80762539D008F7A48 /* event_factory.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_factory.pyste; sourceTree = "<group>"; };
+		DCC30EF90762539D008F7A48 /* event_factory_manager.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_factory_manager.pyste; sourceTree = "<group>"; };
+		DCC30EFA0762539D008F7A48 /* event_list.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_list.pyste; sourceTree = "<group>"; };
+		DCC30EFB0762539D008F7A48 /* event_list_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_list_entry.pyste; sourceTree = "<group>"; };
+		DCC30EFC0762539D008F7A48 /* event_list_iterator.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_list_iterator.pyste; sourceTree = "<group>"; };
+		DCC30EFD0762539D008F7A48 /* event_triggers.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event_triggers.pyste; sourceTree = "<group>"; };
+		DCC30EFE0762539D008F7A48 /* file-fixups.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "file-fixups.cc"; sourceTree = "<group>"; };
+		DCC30EFF0762539D008F7A48 /* file-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "file-fixups.hh"; sourceTree = "<group>"; };
+		DCC30F000762539D008F7A48 /* file.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = file.pyste; sourceTree = "<group>"; };
+		DCC30F010762539D008F7A48 /* fitness_matrix.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = fitness_matrix.pyste; sourceTree = "<group>"; };
+		DCC30F020762539D008F7A48 /* fixed_block.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = fixed_block.pyste; sourceTree = "<group>"; };
+		DCC30F030762539D008F7A48 /* fixed_coords.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = fixed_coords.pyste; sourceTree = "<group>"; };
+		DCC30F040762539D008F7A48 /* genebank.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genebank.pyste; sourceTree = "<group>"; };
+		DCC30F050762539D008F7A48 /* generatePysteFiles.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = generatePysteFiles.py; sourceTree = "<group>"; };
+		DCC30F060762539D008F7A48 /* genesis-fixups.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "genesis-fixups.cc"; sourceTree = "<group>"; };
+		DCC30F070762539D008F7A48 /* genesis-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "genesis-fixups.hh"; sourceTree = "<group>"; };
+		DCC30F080762539D008F7A48 /* genesis.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis.pyste; sourceTree = "<group>"; };
+		DCC30F090762539D008F7A48 /* genome.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genome.pyste; sourceTree = "<group>"; };
+		DCC30F0A0762539D008F7A48 /* genome_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genome_util.pyste; sourceTree = "<group>"; };
+		DCC30F0B0762539D008F7A48 /* genotype.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genotype.pyste; sourceTree = "<group>"; };
+		DCC30F0C0762539D008F7A48 /* genotype_batch.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genotype_batch.pyste; sourceTree = "<group>"; };
+		DCC30F0D0762539D008F7A48 /* genotype_birth_data.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genotype_birth_data.pyste; sourceTree = "<group>"; };
+		DCC30F0E0762539D008F7A48 /* genotype_control.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genotype_control.pyste; sourceTree = "<group>"; };
+		DCC30F0F0762539D008F7A48 /* genotype_test_data.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genotype_test_data.pyste; sourceTree = "<group>"; };
+		DCC30F100762539D008F7A48 /* getting_started1.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = getting_started1.cpp; sourceTree = "<group>"; };
+		DCC30F110762539D008F7A48 /* getting_started2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = getting_started2.cpp; sourceTree = "<group>"; };
+		DCC30F120762539D008F7A48 /* hardware_4stack.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_4stack.pyste; sourceTree = "<group>"; };
+		DCC30F130762539D008F7A48 /* hardware_4stack_thread.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_4stack_thread.pyste; sourceTree = "<group>"; };
+		DCC30F140762539D008F7A48 /* hardware_base.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_base.pyste; sourceTree = "<group>"; };
+		DCC30F150762539D008F7A48 /* hardware_cpu-fixups.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "hardware_cpu-fixups.cc"; sourceTree = "<group>"; };
+		DCC30F160762539D008F7A48 /* hardware_cpu-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "hardware_cpu-fixups.hh"; sourceTree = "<group>"; };
+		DCC30F170762539D008F7A48 /* hardware_cpu.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_cpu.pyste; sourceTree = "<group>"; };
+		DCC30F180762539D008F7A48 /* hardware_cpu_thread.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_cpu_thread.pyste; sourceTree = "<group>"; };
+		DCC30F190762539D008F7A48 /* hardware_factory.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_factory.pyste; sourceTree = "<group>"; };
+		DCC30F1A0762539D008F7A48 /* hardware_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hardware_util.pyste; sourceTree = "<group>"; };
+		DCC30F1B0762539D008F7A48 /* help_alias.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = help_alias.pyste; sourceTree = "<group>"; };
+		DCC30F1C0762539D008F7A48 /* help_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = help_entry.pyste; sourceTree = "<group>"; };
+		DCC30F1D0762539D008F7A48 /* help_full_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = help_full_entry.pyste; sourceTree = "<group>"; };
+		DCC30F1E0762539D008F7A48 /* help_manager.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = help_manager.pyste; sourceTree = "<group>"; };
+		DCC30F1F0762539D008F7A48 /* help_type.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = help_type.pyste; sourceTree = "<group>"; };
+		DCC30F200762539D008F7A48 /* histogram.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = histogram.pyste; sourceTree = "<group>"; };
+		DCC30F210762539D008F7A48 /* indexed_block_struct.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = indexed_block_struct.pyste; sourceTree = "<group>"; };
+		DCC30F220762539D008F7A48 /* init_file.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = init_file.pyste; sourceTree = "<group>"; };
+		DCC30F230762539D008F7A48 /* inject_genebank.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genebank.pyste; sourceTree = "<group>"; };
+		DCC30F240762539D008F7A48 /* inject_genotype.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genotype.pyste; sourceTree = "<group>"; };
+		DCC30F250762539D008F7A48 /* inject_genotype_birth_data.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genotype_birth_data.pyste; sourceTree = "<group>"; };
+		DCC30F260762539D008F7A48 /* inject_genotype_control.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genotype_control.pyste; sourceTree = "<group>"; };
+		DCC30F270762539D008F7A48 /* inject_genotype_element.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genotype_element.pyste; sourceTree = "<group>"; };
+		DCC30F280762539D008F7A48 /* inject_genotype_queue.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inject_genotype_queue.pyste; sourceTree = "<group>"; };
+		DCC30F290762539D008F7A48 /* inst_lib_base.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_lib_base.pyste; sourceTree = "<group>"; };
+		DCC30F2A0762539D008F7A48 /* inst_lib_cpu.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_lib_cpu.pyste; sourceTree = "<group>"; };
+		DCC30F2B0762539D008F7A48 /* inst_set.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.pyste; sourceTree = "<group>"; };
+		DCC30F2C0762539D008F7A48 /* inst_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_util.pyste; sourceTree = "<group>"; };
+		DCC30F2D0762539D008F7A48 /* instruction.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = instruction.pyste; sourceTree = "<group>"; };
+		DCC30F2E0762539D008F7A48 /* int_sum.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = int_sum.pyste; sourceTree = "<group>"; };
+		DCC30F2F0762539D008F7A48 /* integrated_schedule.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = integrated_schedule.pyste; sourceTree = "<group>"; };
+		DCC30F300762539D008F7A48 /* integrated_schedule_node.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = integrated_schedule_node.pyste; sourceTree = "<group>"; };
+		DCC30F310762539D008F7A48 /* kaben_brainstorms.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kaben_brainstorms.cc; sourceTree = "<group>"; };
+		DCC30F320762539D008F7A48 /* kaben_brainstorms.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = kaben_brainstorms.cpp; sourceTree = "<group>"; };
+		DCC30F330762539D008F7A48 /* kaben_brainstorms.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = kaben_brainstorms.pyste; sourceTree = "<group>"; };
+		DCC30F340762539D008F7A48 /* landscape.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = landscape.pyste; sourceTree = "<group>"; };
+		DCC30F350762539D008F7A48 /* lineage.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = lineage.pyste; sourceTree = "<group>"; };
+		DCC30F360762539D008F7A48 /* lineage_control.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = lineage_control.pyste; sourceTree = "<group>"; };
+		DCC30F370762539D008F7A48 /* local_mutations.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = local_mutations.pyste; sourceTree = "<group>"; };
+		DCC30F380762539D008F7A48 /* memory_flags.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = memory_flags.pyste; sourceTree = "<group>"; };
+		DCC30F390762539D008F7A48 /* merit.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = merit.pyste; sourceTree = "<group>"; };
+		DCC30F3A0762539D008F7A48 /* mutation.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = mutation.pyste; sourceTree = "<group>"; };
+		DCC30F3B0762539D008F7A48 /* mutation_lib.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = mutation_lib.pyste; sourceTree = "<group>"; };
+		DCC30F3C0762539D008F7A48 /* mutation_rates.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = mutation_rates.pyste; sourceTree = "<group>"; };
+		DCC30F3D0762539D008F7A48 /* mx_code_array.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = mx_code_array.pyste; sourceTree = "<group>"; };
+		DCC30F3E0762539D008F7A48 /* my_code_array_less_than.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = my_code_array_less_than.pyste; sourceTree = "<group>"; };
+		DCC30F3F0762539D008F7A48 /* org_message.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = org_message.pyste; sourceTree = "<group>"; };
+		DCC30F400762539D008F7A48 /* organism.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.pyste; sourceTree = "<group>"; };
+		DCC30F410762539D008F7A48 /* phenotype.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = phenotype.pyste; sourceTree = "<group>"; };
+		DCC30F430762539D008F7A48 /* population.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = population.pyste; sourceTree = "<group>"; };
+		DCC30F440762539D008F7A48 /* population_cell.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = population_cell.pyste; sourceTree = "<group>"; };
+		DCC30F450762539D008F7A48 /* population_event.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = population_event.pyste; sourceTree = "<group>"; };
+		DCC30F460762539D008F7A48 /* population_event_factory.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = population_event_factory.pyste; sourceTree = "<group>"; };
+		DCC30F470762539D008F7A48 /* population_interface-fixups.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = "population_interface-fixups.hh"; sourceTree = "<group>"; };
+		DCC30F480762539D008F7A48 /* population_interface.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = population_interface.pyste; sourceTree = "<group>"; };
+		DCC30F490762539D008F7A48 /* prob_schedule.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = prob_schedule.pyste; sourceTree = "<group>"; };
+		DCC30F4A0762539D008F7A48 /* py_avida_driver-fixups.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = "py_avida_driver-fixups.cc"; sourceTree = "<group>"; };
+		DCC30F4B0762539D008F7A48 /* py_avida_driver.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = py_avida_driver.hh; sourceTree = "<group>"; };
+		DCC30F4C0762539D008F7A48 /* py_avida_driver.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = py_avida_driver.pyste; sourceTree = "<group>"; };
+		DCC30F4D0762539D008F7A48 /* py_doctest_driver.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_doctest_driver.py; sourceTree = "<group>"; };
+		DCC30F4E0762539D008F7A48 /* py_kaben_brainstorms_t.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_kaben_brainstorms_t.py; sourceTree = "<group>"; };
+		DCC30F4F0762539D008F7A48 /* py_unittest_driver.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = py_unittest_driver.py; sourceTree = "<group>"; };
+		DCC30F500762539D008F7A48 /* random.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = random.pyste; sourceTree = "<group>"; };
+		DCC30F510762539D008F7A48 /* reaction.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = reaction.pyste; sourceTree = "<group>"; };
+		DCC30F520762539D008F7A48 /* reaction_lib.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = reaction_lib.pyste; sourceTree = "<group>"; };
+		DCC30F530762539D008F7A48 /* reaction_process.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = reaction_process.pyste; sourceTree = "<group>"; };
+		DCC30F540762539D008F7A48 /* reaction_requisite.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = reaction_requisite.pyste; sourceTree = "<group>"; };
+		DCC30F550762539D008F7A48 /* reaction_result.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = reaction_result.pyste; sourceTree = "<group>"; };
+		DCC30F560762539D008F7A48 /* ref_block.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ref_block.pyste; sourceTree = "<group>"; };
+		DCC30F570762539D008F7A48 /* resource.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = resource.pyste; sourceTree = "<group>"; };
+		DCC30F580762539D008F7A48 /* resource_count.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = resource_count.pyste; sourceTree = "<group>"; };
+		DCC30F590762539D008F7A48 /* resource_lib.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = resource_lib.pyste; sourceTree = "<group>"; };
+		DCC30F5A0762539D008F7A48 /* running_average.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = running_average.pyste; sourceTree = "<group>"; };
+		DCC30F5B0762539D008F7A48 /* scaled_block.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = scaled_block.pyste; sourceTree = "<group>"; };
+		DCC30F5C0762539D008F7A48 /* schedule.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = schedule.pyste; sourceTree = "<group>"; };
+		DCC30F5D0762539D008F7A48 /* spatial_count_elem.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = spatial_count_elem.pyste; sourceTree = "<group>"; };
+		DCC30F5E0762539D008F7A48 /* spatial_res_count.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = spatial_res_count.pyste; sourceTree = "<group>"; };
+		DCC30F5F0762539D008F7A48 /* species.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = species.pyste; sourceTree = "<group>"; };
+		DCC30F600762539D008F7A48 /* species_control.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = species_control.pyste; sourceTree = "<group>"; };
+		DCC30F610762539D008F7A48 /* species_queue.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = species_queue.pyste; sourceTree = "<group>"; };
+		DCC30F620762539D008F7A48 /* stats.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = stats.pyste; sourceTree = "<group>"; };
+		DCC30F630762539D008F7A48 /* string.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = string.pyste; sourceTree = "<group>"; };
+		DCC30F640762539D008F7A48 /* string_iterator.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = string_iterator.pyste; sourceTree = "<group>"; };
+		DCC30F650762539D008F7A48 /* string_list.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = string_list.pyste; sourceTree = "<group>"; };
+		DCC30F660762539D008F7A48 /* string_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = string_util.pyste; sourceTree = "<group>"; };
+		DCC30F670762539D008F7A48 /* tArray.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tArray.pyste; sourceTree = "<group>"; };
+		DCC30F680762539D008F7A48 /* tArray_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tArray_instantiations.hh; sourceTree = "<group>"; };
+		DCC30F690762539D008F7A48 /* task_entry.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = task_entry.pyste; sourceTree = "<group>"; };
+		DCC30F6A0762539D008F7A48 /* task_lib.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = task_lib.pyste; sourceTree = "<group>"; };
+		DCC30F6B0762539D008F7A48 /* tBuffer.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tBuffer.pyste; sourceTree = "<group>"; };
+		DCC30F6C0762539D008F7A48 /* tBuffer_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tBuffer_instantiations.hh; sourceTree = "<group>"; };
+		DCC30F6D0762539D008F7A48 /* tDictionary.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tDictionary.pyste; sourceTree = "<group>"; };
+		DCC30F6E0762539D008F7A48 /* tDictionary_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDictionary_instantiations.hh; sourceTree = "<group>"; };
+		DCC30F6F0762539D008F7A48 /* test_cpu.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = test_cpu.pyste; sourceTree = "<group>"; };
+		DCC30F700762539D008F7A48 /* test_getting_started1.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = test_getting_started1.py; sourceTree = "<group>"; };
+		DCC30F710762539D008F7A48 /* test_getting_started2.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = test_getting_started2.py; sourceTree = "<group>"; };
+		DCC30F720762539D008F7A48 /* test_util.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = test_util.pyste; sourceTree = "<group>"; };
+		DCC30F730762539D008F7A48 /* tList.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tList.pyste; sourceTree = "<group>"; };
+		DCC30F740762539D008F7A48 /* tList_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tList_instantiations.hh; sourceTree = "<group>"; };
+		DCC30F750762539D008F7A48 /* tMatrix.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tMatrix.pyste; sourceTree = "<group>"; };
+		DCC30F760762539D008F7A48 /* tMatrix_instantiations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tMatrix_instantiations.hh; sourceTree = "<group>"; };
+		DCC30F770762539D008F7A48 /* tools.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tools.pyste; sourceTree = "<group>"; };
+		DCC30F780762539D008F7A48 /* uint.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = uint.pyste; sourceTree = "<group>"; };
+		DCC30F790762539D008F7A48 /* weighted_index.pyste */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = weighted_index.pyste; sourceTree = "<group>"; };
+		DCC30F7A0762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC30F7B0762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC30FA70762539D008F7A48 /* head_multi_mem.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = head_multi_mem.cc; sourceTree = "<group>"; };
+		DCC30FA80762539D008F7A48 /* head_multi_mem.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = head_multi_mem.hh; sourceTree = "<group>"; };
+		DCC30FA90762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC30FAA0762539D008F7A48 /* code_label.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = code_label.cc; sourceTree = "<group>"; };
+		DCC30FAB0762539D008F7A48 /* code_label.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = code_label.hh; sourceTree = "<group>"; };
+		DCC30FAC0762539D008F7A48 /* cpu.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cpu.pri; sourceTree = "<group>"; };
+		DCC30FAD0762539D008F7A48 /* cpu_defs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cpu_defs.hh; sourceTree = "<group>"; };
+		DCC30FB00762539D008F7A48 /* cpu_memory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_memory.cc; sourceTree = "<group>"; };
+		DCC30FB10762539D008F7A48 /* cpu_memory.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cpu_memory.hh; sourceTree = "<group>"; };
+		DCC30FB20762539D008F7A48 /* cpu_stack.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_stack.cc; sourceTree = "<group>"; };
+		DCC30FB30762539D008F7A48 /* cpu_stack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cpu_stack.hh; sourceTree = "<group>"; };
+		DCC30FB40762539D008F7A48 /* cpu_stats.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cpu_stats.hh; sourceTree = "<group>"; };
+		DCC30FB50762539D008F7A48 /* cpu_test_info.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_test_info.cc; sourceTree = "<group>"; };
+		DCC30FB60762539D008F7A48 /* cpu_test_info.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cpu_test_info.hh; sourceTree = "<group>"; };
+		DCC30FB70762539D008F7A48 /* hardware_4stack.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_4stack.cc; sourceTree = "<group>"; };
+		DCC30FB80762539D008F7A48 /* hardware_4stack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_4stack.hh; sourceTree = "<group>"; };
+		DCC30FB90762539D008F7A48 /* hardware_4stack_constants.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_4stack_constants.hh; sourceTree = "<group>"; };
+		DCC30FBA0762539D008F7A48 /* hardware_4stack_thread.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_4stack_thread.cc; sourceTree = "<group>"; };
+		DCC30FBB0762539D008F7A48 /* hardware_4stack_thread.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_4stack_thread.hh; sourceTree = "<group>"; };
+		DCC30FBC0762539D008F7A48 /* hardware_base.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_base.cc; sourceTree = "<group>"; };
+		DCC30FBD0762539D008F7A48 /* hardware_base.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_base.hh; sourceTree = "<group>"; };
+		DCC30FBE0762539D008F7A48 /* hardware_cpu.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_cpu.cc; sourceTree = "<group>"; };
+		DCC30FBF0762539D008F7A48 /* hardware_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_cpu.hh; sourceTree = "<group>"; };
+		DCC30FC00762539D008F7A48 /* hardware_cpu_thread.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_cpu_thread.cc; sourceTree = "<group>"; };
+		DCC30FC10762539D008F7A48 /* hardware_cpu_thread.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_cpu_thread.hh; sourceTree = "<group>"; };
+		DCC30FC20762539D008F7A48 /* hardware_factory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_factory.cc; sourceTree = "<group>"; };
+		DCC30FC30762539D008F7A48 /* hardware_factory.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_factory.hh; sourceTree = "<group>"; };
+		DCC30FC40762539D008F7A48 /* hardware_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_util.cc; sourceTree = "<group>"; };
+		DCC30FC50762539D008F7A48 /* hardware_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hardware_util.hh; sourceTree = "<group>"; };
+		DCC30FC60762539D008F7A48 /* inst_lib_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inst_lib_cpu.hh; sourceTree = "<group>"; };
+		DCC30FC80762539D008F7A48 /* memory_flags.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = memory_flags.cc; sourceTree = "<group>"; };
+		DCC30FC90762539D008F7A48 /* memory_flags.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = memory_flags.hh; sourceTree = "<group>"; };
+		DCC30FCA0762539D008F7A48 /* test_cpu.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_cpu.cc; sourceTree = "<group>"; };
+		DCC30FCB0762539D008F7A48 /* test_cpu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = test_cpu.hh; sourceTree = "<group>"; };
+		DCC30FCC0762539D008F7A48 /* test_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_util.cc; sourceTree = "<group>"; };
+		DCC30FCD0762539D008F7A48 /* test_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = test_util.hh; sourceTree = "<group>"; };
+		DCC30FCE0762539D008F7A48 /* defs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = defs.hh; sourceTree = "<group>"; };
+		DCC30FCF0762539D008F7A48 /* Doxyfile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Doxyfile; sourceTree = "<group>"; };
+		DCC30FEB0762539D008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC30FEC0762539D008F7A48 /* cPopulation.events */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 30; path = cPopulation.events; sourceTree = "<group>"; };
+		DCC30FED0762539D008F7A48 /* cPopulation_event_list */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cPopulation_event_list; sourceTree = "<group>"; };
+		DCC30FEE0762539D008F7A48 /* event.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event.cc; sourceTree = "<group>"; };
+		DCC30FEF0762539D008F7A48 /* event.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event.hh; sourceTree = "<group>"; };
+		DCC30FF00762539D008F7A48 /* event.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = event.pri; sourceTree = "<group>"; };
+		DCC30FF10762539D008F7A48 /* event_factory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_factory.cc; sourceTree = "<group>"; };
+		DCC30FF20762539D008F7A48 /* event_factory.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_factory.hh; sourceTree = "<group>"; };
+		DCC30FF30762539D008F7A48 /* event_factory_manager.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_factory_manager.cc; sourceTree = "<group>"; };
+		DCC30FF40762539D008F7A48 /* event_factory_manager.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_factory_manager.hh; sourceTree = "<group>"; };
+		DCC30FF50762539D008F7A48 /* event_list.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list.cc; sourceTree = "<group>"; };
+		DCC30FF60762539D008F7A48 /* event_list.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_list.hh; sourceTree = "<group>"; };
+		DCC30FF70762539D008F7A48 /* event_list_entry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list_entry.cc; sourceTree = "<group>"; };
+		DCC30FF80762539D008F7A48 /* event_list_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_list_entry.hh; sourceTree = "<group>"; };
+		DCC30FF90762539D008F7A48 /* event_list_iterator.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list_iterator.cc; sourceTree = "<group>"; };
+		DCC30FFA0762539D008F7A48 /* event_list_iterator.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_list_iterator.hh; sourceTree = "<group>"; };
+		DCC30FFB0762539D008F7A48 /* event_triggers.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_triggers.cc; sourceTree = "<group>"; };
+		DCC30FFC0762539D008F7A48 /* event_triggers.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = event_triggers.hh; sourceTree = "<group>"; };
+		DCC30FFD0762539D008F7A48 /* make_events.pl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.perl; path = make_events.pl; sourceTree = "<group>"; };
+		DCC310000762539D008F7A48 /* population_event.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_event.hh; sourceTree = "<group>"; };
+		DCC310010762539D008F7A48 /* population_event_factory.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_event_factory.cc; sourceTree = "<group>"; };
+		DCC310020762539D008F7A48 /* population_event_factory.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_event_factory.hh; sourceTree = "<group>"; };
+		DCC310030762539D008F7A48 /* LEVELS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LEVELS; sourceTree = "<group>"; };
+		DCC310900762539E008F7A48 /* analyze.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze.cc; sourceTree = "<group>"; };
+		DCC310910762539E008F7A48 /* analyze.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze.hh; sourceTree = "<group>"; };
+		DCC310920762539E008F7A48 /* analyze_command.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_command.hh; sourceTree = "<group>"; };
+		DCC310930762539E008F7A48 /* analyze_command_def.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_command_def.hh; sourceTree = "<group>"; };
+		DCC310940762539E008F7A48 /* analyze_command_def_base.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_command_def_base.hh; sourceTree = "<group>"; };
+		DCC310950762539E008F7A48 /* analyze_flow_command.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_flow_command.hh; sourceTree = "<group>"; };
+		DCC310960762539E008F7A48 /* analyze_flow_command_def.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_flow_command_def.hh; sourceTree = "<group>"; };
+		DCC310970762539E008F7A48 /* analyze_function.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_function.hh; sourceTree = "<group>"; };
+		DCC310980762539E008F7A48 /* analyze_genotype.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_genotype.cc; sourceTree = "<group>"; };
+		DCC310990762539E008F7A48 /* analyze_genotype.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_genotype.hh; sourceTree = "<group>"; };
+		DCC3109A0762539E008F7A48 /* analyze_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_util.cc; sourceTree = "<group>"; };
+		DCC3109B0762539E008F7A48 /* analyze_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = analyze_util.hh; sourceTree = "<group>"; };
+		DCC3109C0762539E008F7A48 /* avida.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida.cc; sourceTree = "<group>"; };
+		DCC3109D0762539E008F7A48 /* avida.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = avida.hh; sourceTree = "<group>"; };
+		DCC3109E0762539E008F7A48 /* avida_driver_analyze.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_analyze.cc; sourceTree = "<group>"; };
+		DCC3109F0762539E008F7A48 /* avida_driver_analyze.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = avida_driver_analyze.hh; sourceTree = "<group>"; };
+		DCC310A00762539E008F7A48 /* avida_driver_base.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_base.cc; sourceTree = "<group>"; };
+		DCC310A10762539E008F7A48 /* avida_driver_base.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = avida_driver_base.hh; sourceTree = "<group>"; };
+		DCC310A20762539E008F7A48 /* avida_driver_population.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_population.cc; sourceTree = "<group>"; };
+		DCC310A30762539E008F7A48 /* avida_driver_population.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = avida_driver_population.hh; sourceTree = "<group>"; };
+		DCC310A40762539E008F7A48 /* avida_triggers.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = avida_triggers.hh; sourceTree = "<group>"; };
+		DCC310A50762539E008F7A48 /* birth_chamber.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = birth_chamber.cc; sourceTree = "<group>"; };
+		DCC310A60762539E008F7A48 /* birth_chamber.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = birth_chamber.hh; sourceTree = "<group>"; };
+		DCC310A70762539E008F7A48 /* callback_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = callback_util.cc; sourceTree = "<group>"; };
+		DCC310A80762539E008F7A48 /* callback_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = callback_util.hh; sourceTree = "<group>"; };
+		DCC310A90762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC310AA0762539E008F7A48 /* config.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = config.cc; sourceTree = "<group>"; };
+		DCC310AB0762539E008F7A48 /* config.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = config.hh; sourceTree = "<group>"; };
+		DCC310AC0762539E008F7A48 /* environment.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = environment.cc; sourceTree = "<group>"; };
+		DCC310AD0762539E008F7A48 /* environment.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = environment.hh; sourceTree = "<group>"; };
+		DCC310AE0762539E008F7A48 /* fitness_matrix.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fitness_matrix.cc; sourceTree = "<group>"; };
+		DCC310AF0762539E008F7A48 /* fitness_matrix.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = fitness_matrix.hh; sourceTree = "<group>"; };
+		DCC310C50762539E008F7A48 /* genebank.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genebank.cc; sourceTree = "<group>"; };
+		DCC310C60762539E008F7A48 /* genebank.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genebank.hh; sourceTree = "<group>"; };
+		DCC310C70762539E008F7A48 /* genome.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genome.cc; sourceTree = "<group>"; };
+		DCC310C80762539E008F7A48 /* genome.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genome.hh; sourceTree = "<group>"; };
+		DCC310C90762539E008F7A48 /* genome_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genome_util.cc; sourceTree = "<group>"; };
+		DCC310CA0762539E008F7A48 /* genome_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genome_util.hh; sourceTree = "<group>"; };
+		DCC310CB0762539E008F7A48 /* genotype.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype.cc; sourceTree = "<group>"; };
+		DCC310CC0762539E008F7A48 /* genotype.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype.hh; sourceTree = "<group>"; };
+		DCC310CD0762539E008F7A48 /* genotype_batch.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype_batch.hh; sourceTree = "<group>"; };
+		DCC310CE0762539E008F7A48 /* genotype_birth_data.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_birth_data.cc; sourceTree = "<group>"; };
+		DCC310CF0762539E008F7A48 /* genotype_birth_data.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype_birth_data.hh; sourceTree = "<group>"; };
+		DCC310D00762539E008F7A48 /* genotype_control.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_control.cc; sourceTree = "<group>"; };
+		DCC310D10762539E008F7A48 /* genotype_control.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype_control.hh; sourceTree = "<group>"; };
+		DCC310D20762539E008F7A48 /* genotype_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype_macros.hh; sourceTree = "<group>"; };
+		DCC310D30762539E008F7A48 /* genotype_test_data.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_test_data.cc; sourceTree = "<group>"; };
+		DCC310D40762539E008F7A48 /* genotype_test_data.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genotype_test_data.hh; sourceTree = "<group>"; };
+		DCC310D50762539E008F7A48 /* inject_genebank.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genebank.cc; sourceTree = "<group>"; };
+		DCC310D60762539E008F7A48 /* inject_genebank.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genebank.hh; sourceTree = "<group>"; };
+		DCC310D70762539E008F7A48 /* inject_genebank_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genebank_macros.hh; sourceTree = "<group>"; };
+		DCC310D80762539E008F7A48 /* inject_genotype.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype.cc; sourceTree = "<group>"; };
+		DCC310D90762539E008F7A48 /* inject_genotype.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genotype.hh; sourceTree = "<group>"; };
+		DCC310DA0762539E008F7A48 /* inject_genotype_birth_data.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_birth_data.cc; sourceTree = "<group>"; };
+		DCC310DB0762539E008F7A48 /* inject_genotype_birth_data.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genotype_birth_data.hh; sourceTree = "<group>"; };
+		DCC310DC0762539E008F7A48 /* inject_genotype_control.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_control.cc; sourceTree = "<group>"; };
+		DCC310DD0762539E008F7A48 /* inject_genotype_control.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genotype_control.hh; sourceTree = "<group>"; };
+		DCC310DE0762539E008F7A48 /* inject_genotype_element.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genotype_element.hh; sourceTree = "<group>"; };
+		DCC310DF0762539E008F7A48 /* inject_genotype_queue.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_queue.cc; sourceTree = "<group>"; };
+		DCC310E00762539E008F7A48 /* inject_genotype_queue.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inject_genotype_queue.hh; sourceTree = "<group>"; };
+		DCC310E10762539E008F7A48 /* inst_lib_base.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inst_lib_base.hh; sourceTree = "<group>"; };
+		DCC310E20762539E008F7A48 /* inst_set.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inst_set.cc; sourceTree = "<group>"; };
+		DCC310E30762539E008F7A48 /* inst_set.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inst_set.hh; sourceTree = "<group>"; };
+		DCC310E40762539E008F7A48 /* inst_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inst_util.cc; sourceTree = "<group>"; };
+		DCC310E50762539E008F7A48 /* inst_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = inst_util.hh; sourceTree = "<group>"; };
+		DCC310E60762539E008F7A48 /* instruction.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = instruction.cc; sourceTree = "<group>"; };
+		DCC310E70762539E008F7A48 /* instruction.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = instruction.hh; sourceTree = "<group>"; };
+		DCC310E80762539E008F7A48 /* landscape.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = landscape.cc; sourceTree = "<group>"; };
+		DCC310E90762539E008F7A48 /* landscape.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = landscape.hh; sourceTree = "<group>"; };
+		DCC310EA0762539E008F7A48 /* lineage.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lineage.cc; sourceTree = "<group>"; };
+		DCC310EB0762539E008F7A48 /* lineage.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = lineage.hh; sourceTree = "<group>"; };
+		DCC310EC0762539E008F7A48 /* lineage_control.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lineage_control.cc; sourceTree = "<group>"; };
+		DCC310ED0762539E008F7A48 /* lineage_control.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = lineage_control.hh; sourceTree = "<group>"; };
+		DCC310EE0762539E008F7A48 /* local_mutations.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = local_mutations.cc; sourceTree = "<group>"; };
+		DCC310EF0762539E008F7A48 /* local_mutations.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = local_mutations.hh; sourceTree = "<group>"; };
+		DCC310F00762539E008F7A48 /* main.pro */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = main.pro; sourceTree = "<group>"; };
+		DCC310F10762539E008F7A48 /* main_sub.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = main_sub.pri; sourceTree = "<group>"; };
+		DCC310F30762539E008F7A48 /* mutation.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation.cc; sourceTree = "<group>"; };
+		DCC310F40762539E008F7A48 /* mutation.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = mutation.hh; sourceTree = "<group>"; };
+		DCC310F50762539E008F7A48 /* mutation_lib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation_lib.cc; sourceTree = "<group>"; };
+		DCC310F60762539E008F7A48 /* mutation_lib.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = mutation_lib.hh; sourceTree = "<group>"; };
+		DCC310F70762539E008F7A48 /* mutation_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = mutation_macros.hh; sourceTree = "<group>"; };
+		DCC310F80762539E008F7A48 /* mutation_rates.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation_rates.cc; sourceTree = "<group>"; };
+		DCC310F90762539E008F7A48 /* mutation_rates.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = mutation_rates.hh; sourceTree = "<group>"; };
+		DCC310FA0762539E008F7A48 /* mx_code_array.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mx_code_array.cc; sourceTree = "<group>"; };
+		DCC310FB0762539E008F7A48 /* mx_code_array.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = mx_code_array.hh; sourceTree = "<group>"; };
+		DCC310FC0762539E008F7A48 /* my_code_array_less_than.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = my_code_array_less_than.hh; sourceTree = "<group>"; };
+		DCC310FD0762539E008F7A48 /* org_message.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = org_message.cc; sourceTree = "<group>"; };
+		DCC310FE0762539E008F7A48 /* org_message.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = org_message.hh; sourceTree = "<group>"; };
+		DCC310FF0762539E008F7A48 /* organism.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = organism.cc; sourceTree = "<group>"; };
+		DCC311000762539E008F7A48 /* organism.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = organism.hh; sourceTree = "<group>"; };
+		DCC311010762539E008F7A48 /* phenotype.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = phenotype.cc; sourceTree = "<group>"; };
+		DCC311020762539E008F7A48 /* phenotype.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = phenotype.hh; sourceTree = "<group>"; };
+		DCC311030762539E008F7A48 /* population.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population.cc; sourceTree = "<group>"; };
+		DCC311040762539E008F7A48 /* population.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population.hh; sourceTree = "<group>"; };
+		DCC311050762539E008F7A48 /* population_cell.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_cell.cc; sourceTree = "<group>"; };
+		DCC311060762539E008F7A48 /* population_cell.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_cell.hh; sourceTree = "<group>"; };
+		DCC311070762539E008F7A48 /* population_interface.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_interface.cc; sourceTree = "<group>"; };
+		DCC311080762539E008F7A48 /* population_interface.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = population_interface.hh; sourceTree = "<group>"; };
+		DCC311090762539E008F7A48 /* primitive.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = primitive.cc; sourceTree = "<group>"; };
+		DCC3110A0762539E008F7A48 /* primitive.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = primitive.hh; sourceTree = "<group>"; };
+		DCC3110B0762539E008F7A48 /* reaction.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction.cc; sourceTree = "<group>"; };
+		DCC3110C0762539E008F7A48 /* reaction.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction.hh; sourceTree = "<group>"; };
+		DCC3110D0762539E008F7A48 /* reaction_lib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_lib.cc; sourceTree = "<group>"; };
+		DCC3110E0762539E008F7A48 /* reaction_lib.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_lib.hh; sourceTree = "<group>"; };
+		DCC3110F0762539E008F7A48 /* reaction_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_macros.hh; sourceTree = "<group>"; };
+		DCC311100762539E008F7A48 /* reaction_process.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_process.cc; sourceTree = "<group>"; };
+		DCC311110762539E008F7A48 /* reaction_process.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_process.hh; sourceTree = "<group>"; };
+		DCC311120762539E008F7A48 /* reaction_requisite.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_requisite.cc; sourceTree = "<group>"; };
+		DCC311130762539E008F7A48 /* reaction_requisite.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_requisite.hh; sourceTree = "<group>"; };
+		DCC311140762539E008F7A48 /* reaction_result.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_result.cc; sourceTree = "<group>"; };
+		DCC311150762539E008F7A48 /* reaction_result.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = reaction_result.hh; sourceTree = "<group>"; };
+		DCC311160762539E008F7A48 /* resource.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cc; sourceTree = "<group>"; };
+		DCC311170762539E008F7A48 /* resource.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource.hh; sourceTree = "<group>"; };
+		DCC311180762539E008F7A48 /* resource_count.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource_count.cc; sourceTree = "<group>"; };
+		DCC311190762539E008F7A48 /* resource_count.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_count.hh; sourceTree = "<group>"; };
+		DCC3111A0762539E008F7A48 /* resource_count_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_count_macros.hh; sourceTree = "<group>"; };
+		DCC3111B0762539E008F7A48 /* resource_lib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource_lib.cc; sourceTree = "<group>"; };
+		DCC3111C0762539E008F7A48 /* resource_lib.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_lib.hh; sourceTree = "<group>"; };
+		DCC3111D0762539E008F7A48 /* resource_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = resource_macros.hh; sourceTree = "<group>"; };
+		DCC3111E0762539E008F7A48 /* spatial_count_elem.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = spatial_count_elem.cc; sourceTree = "<group>"; };
+		DCC3111F0762539E008F7A48 /* spatial_count_elem.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = spatial_count_elem.hh; sourceTree = "<group>"; };
+		DCC311200762539E008F7A48 /* spatial_res_count.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = spatial_res_count.cc; sourceTree = "<group>"; };
+		DCC311210762539E008F7A48 /* spatial_res_count.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = spatial_res_count.hh; sourceTree = "<group>"; };
+		DCC311220762539E008F7A48 /* species.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species.cc; sourceTree = "<group>"; };
+		DCC311230762539E008F7A48 /* species.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = species.hh; sourceTree = "<group>"; };
+		DCC311240762539E008F7A48 /* species_control.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species_control.cc; sourceTree = "<group>"; };
+		DCC311250762539E008F7A48 /* species_control.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = species_control.hh; sourceTree = "<group>"; };
+		DCC311260762539E008F7A48 /* species_queue.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species_queue.cc; sourceTree = "<group>"; };
+		DCC311270762539E008F7A48 /* species_queue.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = species_queue.hh; sourceTree = "<group>"; };
+		DCC311280762539E008F7A48 /* stats.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = stats.cc; sourceTree = "<group>"; };
+		DCC311290762539E008F7A48 /* stats.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = stats.hh; sourceTree = "<group>"; };
+		DCC3112A0762539E008F7A48 /* task_entry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_entry.cc; sourceTree = "<group>"; };
+		DCC3112B0762539E008F7A48 /* task_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = task_entry.hh; sourceTree = "<group>"; };
+		DCC3112C0762539E008F7A48 /* task_lib.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_lib.cc; sourceTree = "<group>"; };
+		DCC3112D0762539E008F7A48 /* task_lib.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = task_lib.hh; sourceTree = "<group>"; };
+		DCC311380762539E008F7A48 /* MAP.renamed_to_avoid_naming_conflict_with_stl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = MAP.renamed_to_avoid_naming_conflict_with_stl; sourceTree = "<group>"; };
+		DCC311390762539E008F7A48 /* modules.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = modules.pri; sourceTree = "<group>"; };
+		DCC3114B0762539E008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
+		DCC3114C0762539E008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC311680762539E008F7A48 /* environment.2paths */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.2paths; sourceTree = "<group>"; };
+		DCC311690762539E008F7A48 /* environment.9resource */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.9resource; sourceTree = "<group>"; };
+		DCC3116A0762539E008F7A48 /* environment.all_logic */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.all_logic; sourceTree = "<group>"; };
+		DCC3116B0762539E008F7A48 /* environment.cascade */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cascade; sourceTree = "<group>"; };
+		DCC3116C0762539E008F7A48 /* inst_set.19.short */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.19.short; sourceTree = "<group>"; };
+		DCC3116D0762539E008F7A48 /* inst_set.24.old */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.24.old; sourceTree = "<group>"; };
+		DCC3116E0762539E008F7A48 /* inst_set.26.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.26.default; sourceTree = "<group>"; };
+		DCC3116F0762539E008F7A48 /* inst_set.27.multi */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.27.multi; sourceTree = "<group>"; };
+		DCC311700762539E008F7A48 /* inst_set.27.no-nop */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = "inst_set.27.no-nop"; sourceTree = "<group>"; };
+		DCC311710762539E008F7A48 /* inst_set.27.parasite */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.27.parasite; sourceTree = "<group>"; };
+		DCC311720762539E008F7A48 /* inst_set.28.base */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.28.base; sourceTree = "<group>"; };
+		DCC311730762539E008F7A48 /* inst_set.28.const */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.28.const; sourceTree = "<group>"; };
+		DCC311740762539E008F7A48 /* inst_set.29.base_memsize */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.29.base_memsize; sourceTree = "<group>"; };
+		DCC311750762539E008F7A48 /* inst_set.31.multi */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.31.multi; sourceTree = "<group>"; };
+		DCC311760762539F008F7A48 /* inst_set.32.heads */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.32.heads; sourceTree = "<group>"; };
+		DCC311770762539F008F7A48 /* inst_set.heads.parasite */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.heads.parasite; sourceTree = "<group>"; };
+		DCC311780762539F008F7A48 /* organism.heads.100 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.heads.100; sourceTree = "<group>"; };
+		DCC311790762539F008F7A48 /* organism.heads.15 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.heads.15; sourceTree = "<group>"; };
+		DCC3117A0762539F008F7A48 /* organism.heads.50 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.heads.50; sourceTree = "<group>"; };
+		DCC3117B0762539F008F7A48 /* organism.host */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.host; sourceTree = "<group>"; };
+		DCC3117C0762539F008F7A48 /* organism.host2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.host2; sourceTree = "<group>"; };
+		DCC3117D0762539F008F7A48 /* organism.infected */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.infected; sourceTree = "<group>"; };
+		DCC3117E0762539F008F7A48 /* organism.infected2 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.infected2; sourceTree = "<group>"; };
+		DCC3117F0762539F008F7A48 /* organism.noheads */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.noheads; sourceTree = "<group>"; };
+		DCC311800762539F008F7A48 /* environment.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cfg; sourceTree = "<group>"; };
+		DCC311810762539F008F7A48 /* events.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = events.cfg; sourceTree = "<group>"; };
+		DCC311820762539F008F7A48 /* genesis */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis; sourceTree = "<group>"; };
+		DCC311830762539F008F7A48 /* genesis.4stack */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis.4stack; sourceTree = "<group>"; };
+		DCC311840762539F008F7A48 /* inst_set.4stack */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.4stack; sourceTree = "<group>"; };
+		DCC311850762539F008F7A48 /* inst_set.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.default; sourceTree = "<group>"; };
+		DCC311860762539F008F7A48 /* inst_set.sex */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.sex; sourceTree = "<group>"; };
+		DCC311870762539F008F7A48 /* inst_set.tmp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.tmp; sourceTree = "<group>"; };
+		DCC311890762539F008F7A48 /* organism.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.default; sourceTree = "<group>"; };
+		DCC3118A0762539F008F7A48 /* organism.heads.100 */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.heads.100; sourceTree = "<group>"; };
+		DCC3118B0762539F008F7A48 /* organism.sex */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.sex; sourceTree = "<group>"; };
+		DCC311940762539F008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC311950762539F008F7A48 /* dummy */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = dummy; sourceTree = "<group>"; };
+		DCC311970762539F008F7A48 /* organism.4stack */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.4stack; sourceTree = "<group>"; };
+		DCC311980762539F008F7A48 /* organism.parasite */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.parasite; sourceTree = "<group>"; };
+		DCC3119E0762539F008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC311A70762539F008F7A48 /* unix.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = unix.exp; sourceTree = "<group>"; };
+		DCC311B30762539F008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
+		DCC311B40762539F008F7A48 /* environment.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cfg; sourceTree = "<group>"; };
+		DCC311B50762539F008F7A48 /* events.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = events.cfg; sourceTree = "<group>"; };
+		DCC311B60762539F008F7A48 /* genesis */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis; sourceTree = "<group>"; };
+		DCC311B70762539F008F7A48 /* inst_set.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.default; sourceTree = "<group>"; };
+		DCC311B80762539F008F7A48 /* md5sum.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = md5sum.exp; sourceTree = "<group>"; };
+		DCC311B90762539F008F7A48 /* md5sum.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = md5sum.sh; sourceTree = "<group>"; };
+		DCC311BA0762539F008F7A48 /* organism.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.default; sourceTree = "<group>"; };
+		DCC311C70762539F008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
+		DCC311C80762539F008F7A48 /* detail_pop.100.last_line.expected */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = detail_pop.100.last_line.expected; sourceTree = "<group>"; };
+		DCC311C90762539F008F7A48 /* environment.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cfg; sourceTree = "<group>"; };
+		DCC311CA0762539F008F7A48 /* events.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = events.cfg; sourceTree = "<group>"; };
+		DCC311CB0762539F008F7A48 /* genesis */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis; sourceTree = "<group>"; };
+		DCC311CC0762539F008F7A48 /* inst_set.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.default; sourceTree = "<group>"; };
+		DCC311CD0762539F008F7A48 /* organism.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.default; sourceTree = "<group>"; };
+		DCC311CE0762539F008F7A48 /* tail.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = tail.exp; sourceTree = "<group>"; };
+		DCC311CF0762539F008F7A48 /* tail.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = tail.sh; sourceTree = "<group>"; };
+		DCC311DB0762539F008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
+		DCC311DC0762539F008F7A48 /* environment.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cfg; sourceTree = "<group>"; };
+		DCC311DD0762539F008F7A48 /* events.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = events.cfg; sourceTree = "<group>"; };
+		DCC311DE0762539F008F7A48 /* genesis */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis; sourceTree = "<group>"; };
+		DCC311DF0762539F008F7A48 /* inst_set.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.default; sourceTree = "<group>"; };
+		DCC311E00762539F008F7A48 /* organism.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.default; sourceTree = "<group>"; };
+		DCC311E10762539F008F7A48 /* tail.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = tail.exp; sourceTree = "<group>"; };
+		DCC311E20762539F008F7A48 /* tail.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = tail.sh; sourceTree = "<group>"; };
+		DCC311F50762539F008F7A48 /* analyze.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = analyze.cfg; sourceTree = "<group>"; };
+		DCC311F60762539F008F7A48 /* environment.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.cfg; sourceTree = "<group>"; };
+		DCC311F70762539F008F7A48 /* events.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = events.cfg; sourceTree = "<group>"; };
+		DCC311F80762539F008F7A48 /* genesis */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = genesis; sourceTree = "<group>"; };
+		DCC311F90762539F008F7A48 /* inst_set.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = inst_set.default; sourceTree = "<group>"; };
+		DCC311FA0762539F008F7A48 /* organism.default */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = organism.default; sourceTree = "<group>"; };
+		DCC311FB0762539F008F7A48 /* tail.exp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.exports; path = tail.exp; sourceTree = "<group>"; };
+		DCC311FC0762539F008F7A48 /* tail.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = tail.sh; sourceTree = "<group>"; };
+		DCC3128C076253A0008F7A48 /* 4stack_head.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = 4stack_head.t.cc; sourceTree = "<group>"; };
+		DCC3128D076253A0008F7A48 /* analyze.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze.t.cc; sourceTree = "<group>"; };
+		DCC3128E076253A0008F7A48 /* analyze_command.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_command.t.cc; sourceTree = "<group>"; };
+		DCC3128F076253A0008F7A48 /* analyze_command_def.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_command_def.t.cc; sourceTree = "<group>"; };
+		DCC31290076253A0008F7A48 /* analyze_command_def_base.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_command_def_base.t.cc; sourceTree = "<group>"; };
+		DCC31291076253A0008F7A48 /* analyze_flow_command.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_flow_command.t.cc; sourceTree = "<group>"; };
+		DCC31292076253A0008F7A48 /* analyze_flow_command_def.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_flow_command_def.t.cc; sourceTree = "<group>"; };
+		DCC31293076253A0008F7A48 /* analyze_function.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_function.t.cc; sourceTree = "<group>"; };
+		DCC31294076253A0008F7A48 /* analyze_genotype.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_genotype.t.cc; sourceTree = "<group>"; };
+		DCC31295076253A0008F7A48 /* analyze_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = analyze_util.t.cc; sourceTree = "<group>"; };
+		DCC31296076253A0008F7A48 /* avida.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida.t.cc; sourceTree = "<group>"; };
+		DCC31297076253A0008F7A48 /* avida_driver_analyze.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_analyze.t.cc; sourceTree = "<group>"; };
+		DCC31298076253A0008F7A48 /* avida_driver_base.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_base.t.cc; sourceTree = "<group>"; };
+		DCC31299076253A0008F7A48 /* avida_driver_population.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_driver_population.t.cc; sourceTree = "<group>"; };
+		DCC3129A076253A0008F7A48 /* avida_triggers.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = avida_triggers.t.cc; sourceTree = "<group>"; };
+		DCC3129B076253A0008F7A48 /* birth_chamber.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = birth_chamber.t.cc; sourceTree = "<group>"; };
+		DCC3129C076253A0008F7A48 /* block_struct.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = block_struct.t.cc; sourceTree = "<group>"; };
+		DCC3129D076253A0008F7A48 /* callback_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = callback_util.t.cc; sourceTree = "<group>"; };
+		DCC3129E076253A0008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC3129F076253A0008F7A48 /* config.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = config.t.cc; sourceTree = "<group>"; };
+		DCC312A0076253A0008F7A48 /* const_schedule.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = const_schedule.t.cc; sourceTree = "<group>"; };
+		DCC312A1076253A0008F7A48 /* cpu_head.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_head.t.cc; sourceTree = "<group>"; };
+		DCC312A2076253A0008F7A48 /* cpu_memory.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_memory.t.cc; sourceTree = "<group>"; };
+		DCC312A3076253A0008F7A48 /* cpu_stack.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_stack.t.cc; sourceTree = "<group>"; };
+		DCC312A4076253A0008F7A48 /* cpu_test_info.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_test_info.t.cc; sourceTree = "<group>"; };
+		DCC312A5076253A0008F7A48 /* data_entry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_entry.t.cc; sourceTree = "<group>"; };
+		DCC312A6076253A0008F7A48 /* data_file.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_file.t.cc; sourceTree = "<group>"; };
+		DCC312A7076253A0008F7A48 /* data_file_manager.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_file_manager.t.cc; sourceTree = "<group>"; };
+		DCC312A8076253A0008F7A48 /* data_manager_base.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_manager_base.t.cc; sourceTree = "<group>"; };
+		DCC312A9076253A0008F7A48 /* default_message_display.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = default_message_display.t.cc; sourceTree = "<group>"; };
+		DCC312AA076253A0008F7A48 /* environment.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = environment.t.cc; sourceTree = "<group>"; };
+		DCC312AB076253A0008F7A48 /* event.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event.t.cc; sourceTree = "<group>"; };
+		DCC312AC076253A0008F7A48 /* event_factory.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_factory.t.cc; sourceTree = "<group>"; };
+		DCC312AD076253A0008F7A48 /* event_factory_manager.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_factory_manager.t.cc; sourceTree = "<group>"; };
+		DCC312AE076253A0008F7A48 /* event_list.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list.t.cc; sourceTree = "<group>"; };
+		DCC312AF076253A0008F7A48 /* event_list_entry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list_entry.t.cc; sourceTree = "<group>"; };
+		DCC312B0076253A0008F7A48 /* event_list_iterator.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_list_iterator.t.cc; sourceTree = "<group>"; };
+		DCC312B1076253A0008F7A48 /* file.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = file.t.cc; sourceTree = "<group>"; };
+		DCC312B2076253A0008F7A48 /* fitness_matrix.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fitness_matrix.t.cc; sourceTree = "<group>"; };
+		DCC312B3076253A0008F7A48 /* fixed_coords.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fixed_coords.t.cc; sourceTree = "<group>"; };
+		DCC312B4076253A0008F7A48 /* functions.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = functions.t.cc; sourceTree = "<group>"; };
+		DCC312B5076253A0008F7A48 /* genebank.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genebank.t.cc; sourceTree = "<group>"; };
+		DCC312B6076253A0008F7A48 /* genesis.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genesis.t.cc; sourceTree = "<group>"; };
+		DCC312B7076253A0008F7A48 /* genome.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genome.t.cc; sourceTree = "<group>"; };
+		DCC312B8076253A0008F7A48 /* genome_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genome_util.t.cc; sourceTree = "<group>"; };
+		DCC312B9076253A0008F7A48 /* genotype.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype.t.cc; sourceTree = "<group>"; };
+		DCC312BA076253A0008F7A48 /* genotype_batch.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_batch.t.cc; sourceTree = "<group>"; };
+		DCC312BB076253A0008F7A48 /* genotype_birth_data.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_birth_data.t.cc; sourceTree = "<group>"; };
+		DCC312BC076253A0008F7A48 /* genotype_control.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_control.t.cc; sourceTree = "<group>"; };
+		DCC312BD076253A0008F7A48 /* hardware_4stack.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_4stack.t.cc; sourceTree = "<group>"; };
+		DCC312BE076253A0008F7A48 /* hardware_4stack_thread.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_4stack_thread.t.cc; sourceTree = "<group>"; };
+		DCC312BF076253A0008F7A48 /* hardware_base.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_base.t.cc; sourceTree = "<group>"; };
+		DCC312C0076253A0008F7A48 /* hardware_cpu.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_cpu.t.cc; sourceTree = "<group>"; };
+		DCC312C1076253A0008F7A48 /* hardware_cpu_thread.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_cpu_thread.t.cc; sourceTree = "<group>"; };
+		DCC312C2076253A0008F7A48 /* hardware_factory.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_factory.t.cc; sourceTree = "<group>"; };
+		DCC312C3076253A0008F7A48 /* hardware_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hardware_util.t.cc; sourceTree = "<group>"; };
+		DCC312C4076253A0008F7A48 /* help_alias.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_alias.t.cc; sourceTree = "<group>"; };
+		DCC312C5076253A0008F7A48 /* help_entry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_entry.t.cc; sourceTree = "<group>"; };
+		DCC312C6076253A0008F7A48 /* help_full_entry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_full_entry.t.cc; sourceTree = "<group>"; };
+		DCC312C7076253A0008F7A48 /* help_manager.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_manager.t.cc; sourceTree = "<group>"; };
+		DCC312C8076253A0008F7A48 /* help_type.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_type.t.cc; sourceTree = "<group>"; };
+		DCC312C9076253A0008F7A48 /* histogram.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = histogram.t.cc; sourceTree = "<group>"; };
+		DCC312CA076253A0008F7A48 /* indexed_block_struct.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = indexed_block_struct.t.cc; sourceTree = "<group>"; };
+		DCC312CB076253A0008F7A48 /* init_file.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = init_file.t.cc; sourceTree = "<group>"; };
+		DCC312CC076253A0008F7A48 /* inject_genebank.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genebank.t.cc; sourceTree = "<group>"; };
+		DCC312CD076253A0008F7A48 /* inject_genotype.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype.t.cc; sourceTree = "<group>"; };
+		DCC312CE076253A0008F7A48 /* inject_genotype_birth_data.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_birth_data.t.cc; sourceTree = "<group>"; };
+		DCC312CF076253A0008F7A48 /* inject_genotype_control.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_control.t.cc; sourceTree = "<group>"; };
+		DCC312D0076253A0008F7A48 /* inject_genotype_element.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_element.t.cc; sourceTree = "<group>"; };
+		DCC312D1076253A0008F7A48 /* inject_genotype_queue.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inject_genotype_queue.t.cc; sourceTree = "<group>"; };
+		DCC312D2076253A0008F7A48 /* inst_lib_base.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inst_lib_base.t.cc; sourceTree = "<group>"; };
+		DCC312D3076253A0008F7A48 /* inst_set.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inst_set.t.cc; sourceTree = "<group>"; };
+		DCC312D4076253A0008F7A48 /* inst_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = inst_util.t.cc; sourceTree = "<group>"; };
+		DCC312D5076253A0008F7A48 /* integrated_schedule.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = integrated_schedule.t.cc; sourceTree = "<group>"; };
+		DCC312D6076253A0008F7A48 /* integrated_schedule_node.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = integrated_schedule_node.t.cc; sourceTree = "<group>"; };
+		DCC312D7076253A0008F7A48 /* landscape.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = landscape.t.cc; sourceTree = "<group>"; };
+		DCC312E7076253A0008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC312E8076253A0008F7A48 /* count_tracker.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = count_tracker.t.cc; sourceTree = "<group>"; };
+		DCC312E9076253A0008F7A48 /* cpu_stats.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cpu_stats.t.cc; sourceTree = "<group>"; };
+		DCC312EA076253A0008F7A48 /* double_sum.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = double_sum.t.cc; sourceTree = "<group>"; };
+		DCC312EB076253A0008F7A48 /* event_triggers.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = event_triggers.t.cc; sourceTree = "<group>"; };
+		DCC312EC076253A0008F7A48 /* fixed_block.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fixed_block.t.cc; sourceTree = "<group>"; };
+		DCC312ED076253A0008F7A48 /* genotype_test_data.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genotype_test_data.t.cc; sourceTree = "<group>"; };
+		DCC312EE076253A0008F7A48 /* int_sum.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = int_sum.t.cc; sourceTree = "<group>"; };
+		DCC312F0076253A0008F7A48 /* memory_flags.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = memory_flags.t.cc; sourceTree = "<group>"; };
+		DCC312F1076253A0008F7A48 /* merit.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = merit.t.cc; sourceTree = "<group>"; };
+		DCC312F2076253A0008F7A48 /* template.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = template.t.cc; sourceTree = "<group>"; };
+		DCC312FA076253A0008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC312FB076253A0008F7A48 /* code_label.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = code_label.t.cc; sourceTree = "<group>"; };
+		DCC312FC076253A0008F7A48 /* instruction.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = instruction.t.cc; sourceTree = "<group>"; };
+		DCC312FE076253A0008F7A48 /* lineage.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lineage.t.cc; sourceTree = "<group>"; };
+		DCC312FF076253A0008F7A48 /* lineage_control.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = lineage_control.t.cc; sourceTree = "<group>"; };
+		DCC31300076253A0008F7A48 /* local_mutations.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = local_mutations.t.cc; sourceTree = "<group>"; };
+		DCC31302076253A0008F7A48 /* message_class.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_class.t.cc; sourceTree = "<group>"; };
+		DCC31303076253A0008F7A48 /* message_closure.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_closure.t.cc; sourceTree = "<group>"; };
+		DCC31304076253A0008F7A48 /* message_display.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_display.t.cc; sourceTree = "<group>"; };
+		DCC31305076253A0008F7A48 /* message_type.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_type.t.cc; sourceTree = "<group>"; };
+		DCC31306076253A0008F7A48 /* mutation.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation.t.cc; sourceTree = "<group>"; };
+		DCC31307076253A0008F7A48 /* mutation_lib.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation_lib.t.cc; sourceTree = "<group>"; };
+		DCC31308076253A0008F7A48 /* mutation_rates.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mutation_rates.t.cc; sourceTree = "<group>"; };
+		DCC31309076253A0008F7A48 /* mx_code_array.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mx_code_array.t.cc; sourceTree = "<group>"; };
+		DCC3130A076253A0008F7A48 /* my_code_array_less_than.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = my_code_array_less_than.t.cc; sourceTree = "<group>"; };
+		DCC3130E076253A0008F7A48 /* org_message.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = org_message.t.cc; sourceTree = "<group>"; };
+		DCC3130F076253A0008F7A48 /* organism.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = organism.t.cc; sourceTree = "<group>"; };
+		DCC31310076253A0008F7A48 /* phenotype.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = phenotype.t.cc; sourceTree = "<group>"; };
+		DCC31311076253A0008F7A48 /* population.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population.t.cc; sourceTree = "<group>"; };
+		DCC31312076253A0008F7A48 /* population_cell.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_cell.t.cc; sourceTree = "<group>"; };
+		DCC31313076253A0008F7A48 /* population_event.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_event.t.cc; sourceTree = "<group>"; };
+		DCC31314076253A0008F7A48 /* population_event_factory.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_event_factory.t.cc; sourceTree = "<group>"; };
+		DCC31315076253A0008F7A48 /* population_interface.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = population_interface.t.cc; sourceTree = "<group>"; };
+		DCC31316076253A0008F7A48 /* prob_schedule.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = prob_schedule.t.cc; sourceTree = "<group>"; };
+		DCC31317076253A0008F7A48 /* random.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = random.t.cc; sourceTree = "<group>"; };
+		DCC31318076253A0008F7A48 /* reaction.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction.t.cc; sourceTree = "<group>"; };
+		DCC31319076253A0008F7A48 /* reaction_lib.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_lib.t.cc; sourceTree = "<group>"; };
+		DCC3131A076253A0008F7A48 /* reaction_process.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_process.t.cc; sourceTree = "<group>"; };
+		DCC3131B076253A0008F7A48 /* reaction_result.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = reaction_result.t.cc; sourceTree = "<group>"; };
+		DCC3131C076253A0008F7A48 /* ref_block.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ref_block.t.cc; sourceTree = "<group>"; };
+		DCC3131D076253A0008F7A48 /* resource.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource.t.cc; sourceTree = "<group>"; };
+		DCC3131E076253A0008F7A48 /* resource_count.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource_count.t.cc; sourceTree = "<group>"; };
+		DCC3131F076253A0008F7A48 /* resource_lib.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = resource_lib.t.cc; sourceTree = "<group>"; };
+		DCC31320076253A0008F7A48 /* running_average.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = running_average.t.cc; sourceTree = "<group>"; };
+		DCC31321076253A0008F7A48 /* scaled_block.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = scaled_block.t.cc; sourceTree = "<group>"; };
+		DCC31322076253A0008F7A48 /* schedule.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = schedule.t.cc; sourceTree = "<group>"; };
+		DCC31323076253A0008F7A48 /* spatial_count_elem.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = spatial_count_elem.t.cc; sourceTree = "<group>"; };
+		DCC31324076253A0008F7A48 /* spatial_res_count.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = spatial_res_count.t.cc; sourceTree = "<group>"; };
+		DCC31325076253A0008F7A48 /* species.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species.t.cc; sourceTree = "<group>"; };
+		DCC31326076253A0008F7A48 /* species_control.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species_control.t.cc; sourceTree = "<group>"; };
+		DCC31327076253A0008F7A48 /* species_queue.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = species_queue.t.cc; sourceTree = "<group>"; };
+		DCC31328076253A0008F7A48 /* stats.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = stats.t.cc; sourceTree = "<group>"; };
+		DCC31329076253A0008F7A48 /* string.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string.t.cc; sourceTree = "<group>"; };
+		DCC3132A076253A0008F7A48 /* string_iterator.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_iterator.t.cc; sourceTree = "<group>"; };
+		DCC3132B076253A0008F7A48 /* string_list.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_list.t.cc; sourceTree = "<group>"; };
+		DCC3132C076253A0008F7A48 /* string_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_util.t.cc; sourceTree = "<group>"; };
+		DCC3132D076253A0008F7A48 /* tArgDataEntry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tArgDataEntry.t.cc; sourceTree = "<group>"; };
+		DCC3132E076253A0008F7A48 /* tArray.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tArray.t.cc; sourceTree = "<group>"; };
+		DCC3132F076253A0008F7A48 /* task_entry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_entry.t.cc; sourceTree = "<group>"; };
+		DCC31330076253A0008F7A48 /* task_lib.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_lib.t.cc; sourceTree = "<group>"; };
+		DCC31331076253A0008F7A48 /* tBuffer.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tBuffer.t.cc; sourceTree = "<group>"; };
+		DCC31332076253A0008F7A48 /* tDataEntry.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tDataEntry.t.cc; sourceTree = "<group>"; };
+		DCC31333076253A0008F7A48 /* tDataEntryBase.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tDataEntryBase.t.cc; sourceTree = "<group>"; };
+		DCC31334076253A0008F7A48 /* tDataEntryCommand.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tDataEntryCommand.t.cc; sourceTree = "<group>"; };
+		DCC31335076253A0008F7A48 /* tDataManager.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tDataManager.t.cc; sourceTree = "<group>"; };
+		DCC31336076253A0008F7A48 /* tDictionary.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tDictionary.t.cc; sourceTree = "<group>"; };
+		DCC31337076253A0008F7A48 /* template.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = template.t.cc; sourceTree = "<group>"; };
+		DCC31338076253A0008F7A48 /* test_cpu.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_cpu.t.cc; sourceTree = "<group>"; };
+		DCC31339076253A0008F7A48 /* test_util.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_util.t.cc; sourceTree = "<group>"; };
+		DCC3133A076253A0008F7A48 /* tList.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tList.t.cc; sourceTree = "<group>"; };
+		DCC3133B076253A0008F7A48 /* tMatrix.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tMatrix.t.cc; sourceTree = "<group>"; };
+		DCC3133C076253A0008F7A48 /* tools.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tools.t.cc; sourceTree = "<group>"; };
+		DCC3133D076253A0008F7A48 /* tVector.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tVector.t.cc; sourceTree = "<group>"; };
+		DCC3133E076253A0008F7A48 /* uint.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = uint.t.cc; sourceTree = "<group>"; };
+		DCC3133F076253A0008F7A48 /* weighted_index.t.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = weighted_index.t.cc; sourceTree = "<group>"; };
+		DCC31345076253A0008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC31361076253A0008F7A48 /* AbstractFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AbstractFactory.h; sourceTree = "<group>"; };
+		DCC31362076253A0008F7A48 /* AssocVector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssocVector.h; sourceTree = "<group>"; };
+		DCC31366076253A0008F7A48 /* EmptyType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyType.h; sourceTree = "<group>"; };
+		DCC31367076253A0008F7A48 /* Factory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Factory.h; sourceTree = "<group>"; };
+		DCC31368076253A0008F7A48 /* Functor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Functor.h; sourceTree = "<group>"; };
+		DCC31369076253A0008F7A48 /* HierarchyGenerators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HierarchyGenerators.h; sourceTree = "<group>"; };
+		DCC3136A076253A0008F7A48 /* Loki.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Loki.pri; sourceTree = "<group>"; };
+		DCC31378076253A1008F7A48 /* EmptyType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyType.h; sourceTree = "<group>"; };
+		DCC31379076253A1008F7A48 /* NullType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NullType.h; sourceTree = "<group>"; };
+		DCC3137A076253A1008F7A48 /* portby.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = portby.txt; sourceTree = "<group>"; };
+		DCC3137B076253A1008F7A48 /* TypeList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeList.h; sourceTree = "<group>"; };
+		DCC3137C076253A1008F7A48 /* TypeManip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeManip.h; sourceTree = "<group>"; };
+		DCC3137D076253A1008F7A48 /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
+		DCC3139A076253A1008F7A48 /* AbstractFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AbstractFactory.h; sourceTree = "<group>"; };
+		DCC3139B076253A1008F7A48 /* AssocVector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssocVector.h; sourceTree = "<group>"; };
+		DCC3139C076253A1008F7A48 /* EmptyType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyType.h; sourceTree = "<group>"; };
+		DCC3139D076253A1008F7A48 /* Factory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Factory.h; sourceTree = "<group>"; };
+		DCC3139E076253A1008F7A48 /* Functor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Functor.h; sourceTree = "<group>"; };
+		DCC3139F076253A1008F7A48 /* HierarchyGenerators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HierarchyGenerators.h; sourceTree = "<group>"; };
+		DCC313A0076253A1008F7A48 /* MinMax.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MinMax.h; sourceTree = "<group>"; };
+		DCC313A1076253A1008F7A48 /* MultiMethods.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MultiMethods.h; sourceTree = "<group>"; };
+		DCC313A2076253A1008F7A48 /* NullType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NullType.h; sourceTree = "<group>"; };
+		DCC313A3076253A1008F7A48 /* portby.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = portby.txt; sourceTree = "<group>"; };
+		DCC313A4076253A1008F7A48 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; };
+		DCC313A5076253A1008F7A48 /* Singleton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Singleton.cpp; sourceTree = "<group>"; };
+		DCC313A6076253A1008F7A48 /* Singleton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Singleton.h; sourceTree = "<group>"; };
+		DCC313A7076253A1008F7A48 /* SmallObj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SmallObj.cpp; sourceTree = "<group>"; };
+		DCC313A8076253A1008F7A48 /* SmallObj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmallObj.h; sourceTree = "<group>"; };
+		DCC313A9076253A1008F7A48 /* SmartPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmartPtr.h; sourceTree = "<group>"; };
+		DCC313AA076253A1008F7A48 /* static_check.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = static_check.h; sourceTree = "<group>"; };
+		DCC313AB076253A1008F7A48 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = "<group>"; };
+		DCC313AC076253A1008F7A48 /* TypeInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeInfo.h; sourceTree = "<group>"; };
+		DCC313AD076253A1008F7A48 /* TypeList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeList.h; sourceTree = "<group>"; };
+		DCC313AE076253A1008F7A48 /* TypeManip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeManip.h; sourceTree = "<group>"; };
+		DCC313AF076253A1008F7A48 /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
+		DCC313B0076253A1008F7A48 /* Variant.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Variant.h; sourceTree = "<group>"; };
+		DCC313B1076253A1008F7A48 /* VC_Alignment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VC_Alignment.h; sourceTree = "<group>"; };
+		DCC313B2076253A1008F7A48 /* Visitor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Visitor.h; sourceTree = "<group>"; };
+		DCC313B3076253A1008F7A48 /* MultiMethods.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MultiMethods.h; sourceTree = "<group>"; };
+		DCC313B4076253A1008F7A48 /* NullType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NullType.h; sourceTree = "<group>"; };
+		DCC313B5076253A1008F7A48 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; };
+		DCC313CF076253A1008F7A48 /* AbstractFactory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AbstractFactory.h; sourceTree = "<group>"; };
+		DCC313D0076253A1008F7A48 /* AssocVector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssocVector.h; sourceTree = "<group>"; };
+		DCC313D1076253A1008F7A48 /* EmptyType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = EmptyType.h; sourceTree = "<group>"; };
+		DCC313D2076253A1008F7A48 /* Factory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Factory.h; sourceTree = "<group>"; };
+		DCC313D3076253A1008F7A48 /* Functor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Functor.h; sourceTree = "<group>"; };
+		DCC313D4076253A1008F7A48 /* HierarchyGenerators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HierarchyGenerators.h; sourceTree = "<group>"; };
+		DCC313D5076253A1008F7A48 /* MultiMethods.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MultiMethods.h; sourceTree = "<group>"; };
+		DCC313D6076253A1008F7A48 /* NullType.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NullType.h; sourceTree = "<group>"; };
+		DCC313D7076253A1008F7A48 /* readme.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = readme.txt; sourceTree = "<group>"; };
+		DCC313D8076253A1008F7A48 /* Singleton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Singleton.cpp; sourceTree = "<group>"; };
+		DCC313D9076253A1008F7A48 /* Singleton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Singleton.h; sourceTree = "<group>"; };
+		DCC313DA076253A1008F7A48 /* SmallObj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SmallObj.cpp; sourceTree = "<group>"; };
+		DCC313DB076253A1008F7A48 /* SmallObj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmallObj.h; sourceTree = "<group>"; };
+		DCC313DC076253A1008F7A48 /* SmartPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmartPtr.h; sourceTree = "<group>"; };
+		DCC313DD076253A1008F7A48 /* static_check.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = static_check.h; sourceTree = "<group>"; };
+		DCC313DE076253A1008F7A48 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = "<group>"; };
+		DCC313DF076253A1008F7A48 /* Tuple.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Tuple.h; sourceTree = "<group>"; };
+		DCC313E0076253A1008F7A48 /* TypeInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeInfo.h; sourceTree = "<group>"; };
+		DCC313E1076253A1008F7A48 /* Typelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Typelist.h; sourceTree = "<group>"; };
+		DCC313E2076253A1008F7A48 /* TypeManip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeManip.h; sourceTree = "<group>"; };
+		DCC313E3076253A1008F7A48 /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
+		DCC313E4076253A1008F7A48 /* Visitor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Visitor.h; sourceTree = "<group>"; };
+		DCC313E5076253A1008F7A48 /* Singleton.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Singleton.cpp; sourceTree = "<group>"; };
+		DCC313E6076253A1008F7A48 /* Singleton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Singleton.h; sourceTree = "<group>"; };
+		DCC313E7076253A1008F7A48 /* SmallObj.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SmallObj.cpp; sourceTree = "<group>"; };
+		DCC313E8076253A1008F7A48 /* SmallObj.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmallObj.h; sourceTree = "<group>"; };
+		DCC313E9076253A1008F7A48 /* SmartPtr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SmartPtr.h; sourceTree = "<group>"; };
+		DCC313EA076253A1008F7A48 /* static_check.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = static_check.h; sourceTree = "<group>"; };
+		DCC313EB076253A1008F7A48 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Threads.h; sourceTree = "<group>"; };
+		DCC313FB076253A1008F7A48 /* Tuple.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Tuple.h; sourceTree = "<group>"; };
+		DCC313FC076253A1008F7A48 /* TypeInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeInfo.h; sourceTree = "<group>"; };
+		DCC313FD076253A1008F7A48 /* Typelist.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Typelist.h; sourceTree = "<group>"; };
+		DCC313FE076253A1008F7A48 /* TypeManip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeManip.h; sourceTree = "<group>"; };
+		DCC313FF076253A1008F7A48 /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };
+		DCC31400076253A1008F7A48 /* Visitor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Visitor.h; sourceTree = "<group>"; };
+		DCC31423076253A1008F7A48 /* curses.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = curses.h; sourceTree = "<group>"; };
+		DCC31424076253A1008F7A48 /* pdcurses.lib */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = pdcurses.lib; sourceTree = "<group>"; };
+		DCC31425076253A1008F7A48 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README.txt; sourceTree = "<group>"; };
+		DCC3143B076253A1008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC3143C076253A1008F7A48 /* compare.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = compare.c; sourceTree = "<group>"; };
+		DCC3144A076253A1008F7A48 /* doc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc.h; sourceTree = "<group>"; };
+		DCC3144B076253A1008F7A48 /* doc_dynamic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_dynamic.h; sourceTree = "<group>"; };
+		DCC3144C076253A1008F7A48 /* doc_printf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_printf.h; sourceTree = "<group>"; };
+		DCC3144D076253A1008F7A48 /* doc_register.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_register.h; sourceTree = "<group>"; };
+		DCC3144E076253A1008F7A48 /* doc_scanf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_scanf.h; sourceTree = "<group>"; };
+		DCC3144F076253A1008F7A48 /* doc_static.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = doc_static.h; sourceTree = "<group>"; };
+		DCC31450076253A1008F7A48 /* footer.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = footer.html; sourceTree = "<group>"; };
+		DCC31451076253A1008F7A48 /* header.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = header.html; sourceTree = "<group>"; };
+		DCC31452076253A1008F7A48 /* trio.cfg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.cfg; sourceTree = "<group>"; };
+		DCC31453076253A1008F7A48 /* trio.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.css; sourceTree = "<group>"; };
+		DCC31454076253A1008F7A48 /* example.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = example.c; sourceTree = "<group>"; };
+		DCC31461076253A1008F7A48 /* group___dynamic_strings.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___dynamic_strings.html; sourceTree = "<group>"; };
+		DCC31462076253A1008F7A48 /* group___printf.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___printf.html; sourceTree = "<group>"; };
+		DCC31463076253A1008F7A48 /* group___scanf.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___scanf.html; sourceTree = "<group>"; };
+		DCC31464076253A1008F7A48 /* group___special_quantities.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___special_quantities.html; sourceTree = "<group>"; };
+		DCC31465076253A1008F7A48 /* group___static_strings.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___static_strings.html; sourceTree = "<group>"; };
+		DCC31466076253A1008F7A48 /* group___user_defined.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = group___user_defined.html; sourceTree = "<group>"; };
+		DCC31467076253A1008F7A48 /* index.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = index.html; sourceTree = "<group>"; };
+		DCC31468076253A1008F7A48 /* modules.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = modules.html; sourceTree = "<group>"; };
+		DCC31469076253A1008F7A48 /* trio.css */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.css; sourceTree = "<group>"; };
+		DCC3146B076253A1008F7A48 /* regression.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = regression.c; sourceTree = "<group>"; };
+		DCC3146C076253A1008F7A48 /* strio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = strio.h; sourceTree = "<group>"; };
+		DCC3146D076253A1008F7A48 /* trio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = trio.c; sourceTree = "<group>"; };
+		DCC3146E076253A1008F7A48 /* trio.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trio.h; sourceTree = "<group>"; };
+		DCC3146F076253A1008F7A48 /* trio.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = trio.pri; sourceTree = "<group>"; };
+		DCC31470076253A1008F7A48 /* triodef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triodef.h; sourceTree = "<group>"; };
+		DCC31471076253A1008F7A48 /* trionan.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = trionan.c; sourceTree = "<group>"; };
+		DCC31472076253A1008F7A48 /* trionan.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = trionan.h; sourceTree = "<group>"; };
+		DCC31473076253A1008F7A48 /* triop.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triop.h; sourceTree = "<group>"; };
+		DCC31474076253A1008F7A48 /* triostr.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = triostr.c; sourceTree = "<group>"; };
+		DCC31475076253A1008F7A48 /* triostr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = triostr.h; sourceTree = "<group>"; };
+		DCC314B7076253A2008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC314B8076253A2008F7A48 /* cStringable.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cStringable.hh; sourceTree = "<group>"; };
+		DCC314B9076253A2008F7A48 /* cTestCase.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTestCase.cc; sourceTree = "<group>"; };
+		DCC314BA076253A2008F7A48 /* cTestCase.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cTestCase.hh; sourceTree = "<group>"; };
+		DCC314BB076253A2008F7A48 /* cTestProblem.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTestProblem.cc; sourceTree = "<group>"; };
+		DCC314BC076253A2008F7A48 /* cTestProblem.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cTestProblem.hh; sourceTree = "<group>"; };
+		DCC314BD076253A2008F7A48 /* cTestResult.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTestResult.cc; sourceTree = "<group>"; };
+		DCC314BE076253A2008F7A48 /* cTestResult.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cTestResult.hh; sourceTree = "<group>"; };
+		DCC314BF076253A2008F7A48 /* cTextTestInterpreter.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cTextTestInterpreter.cc; sourceTree = "<group>"; };
+		DCC314C0076253A2008F7A48 /* cTextTestInterpreter.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cTextTestInterpreter.hh; sourceTree = "<group>"; };
+		DCC314CA076253A2008F7A48 /* point.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = point.h; sourceTree = "<group>"; };
+		DCC314CB076253A2008F7A48 /* test_case_point.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_case_point.cpp; sourceTree = "<group>"; };
+		DCC314CC076253A2008F7A48 /* test_case_point.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = test_case_point.h; sourceTree = "<group>"; };
+		DCC314CD076253A2008F7A48 /* test_point.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_point.cpp; sourceTree = "<group>"; };
+		DCC314CF076253A2008F7A48 /* stringable.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stringable.h; sourceTree = "<group>"; };
+		DCC314D0076253A2008F7A48 /* test_case.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_case.cpp; sourceTree = "<group>"; };
+		DCC314D1076253A2008F7A48 /* test_case.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = test_case.h; sourceTree = "<group>"; };
+		DCC314D2076253A2008F7A48 /* test_problem.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_problem.cpp; sourceTree = "<group>"; };
+		DCC314D3076253A2008F7A48 /* test_problem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = test_problem.h; sourceTree = "<group>"; };
+		DCC314D4076253A2008F7A48 /* test_result.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_result.cpp; sourceTree = "<group>"; };
+		DCC314D5076253A2008F7A48 /* test_result.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = test_result.h; sourceTree = "<group>"; };
+		DCC314D6076253A2008F7A48 /* text_test_interpreter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = text_test_interpreter.cpp; sourceTree = "<group>"; };
+		DCC314D7076253A2008F7A48 /* text_test_interpreter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = text_test_interpreter.h; sourceTree = "<group>"; };
+		DCC31545076253A4008F7A48 /* block_struct.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = block_struct.cc; sourceTree = "<group>"; };
+		DCC31546076253A4008F7A48 /* block_struct.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = block_struct.hh; sourceTree = "<group>"; };
+		DCC31547076253A4008F7A48 /* cCycleCheck.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = cCycleCheck.cc; sourceTree = "<group>"; };
+		DCC31548076253A4008F7A48 /* cCycleCheck.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cCycleCheck.hh; sourceTree = "<group>"; };
+		DCC31549076253A4008F7A48 /* cID.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cID.hh; sourceTree = "<group>"; };
+		DCC3154A076253A4008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC3154B076253A4008F7A48 /* const_schedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = const_schedule.cc; sourceTree = "<group>"; };
+		DCC3154C076253A4008F7A48 /* const_schedule.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = const_schedule.hh; sourceTree = "<group>"; };
+		DCC3154D076253A4008F7A48 /* count_tracker.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = count_tracker.cc; sourceTree = "<group>"; };
+		DCC3154E076253A4008F7A48 /* count_tracker.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = count_tracker.hh; sourceTree = "<group>"; };
+		DCC3154F076253A4008F7A48 /* cVerifierSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = cVerifierSuiteRecurser.hh; sourceTree = "<group>"; };
+		DCC31550076253A4008F7A48 /* data_entry.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_entry.cc; sourceTree = "<group>"; };
+		DCC31551076253A4008F7A48 /* data_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = data_entry.hh; sourceTree = "<group>"; };
+		DCC31552076253A4008F7A48 /* data_file.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_file.cc; sourceTree = "<group>"; };
+		DCC31553076253A4008F7A48 /* data_file.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = data_file.hh; sourceTree = "<group>"; };
+		DCC31554076253A4008F7A48 /* data_file_manager.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_file_manager.cc; sourceTree = "<group>"; };
+		DCC31555076253A4008F7A48 /* data_file_manager.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = data_file_manager.hh; sourceTree = "<group>"; };
+		DCC31556076253A4008F7A48 /* data_manager_base.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = data_manager_base.cc; sourceTree = "<group>"; };
+		DCC31557076253A4008F7A48 /* data_manager_base.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = data_manager_base.hh; sourceTree = "<group>"; };
+		DCC31558076253A4008F7A48 /* default_message_display.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = default_message_display.cc; sourceTree = "<group>"; };
+		DCC31559076253A4008F7A48 /* default_message_display.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = default_message_display.hh; sourceTree = "<group>"; };
+		DCC3155A076253A4008F7A48 /* double_sum.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = double_sum.cc; sourceTree = "<group>"; };
+		DCC3155B076253A4008F7A48 /* double_sum.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = double_sum.hh; sourceTree = "<group>"; };
+		DCC3155C076253A4008F7A48 /* file.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = file.cc; sourceTree = "<group>"; };
+		DCC3155D076253A4008F7A48 /* file.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = file.hh; sourceTree = "<group>"; };
+		DCC3155E076253A4008F7A48 /* fixed_block.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fixed_block.cc; sourceTree = "<group>"; };
+		DCC3155F076253A4008F7A48 /* fixed_block.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = fixed_block.hh; sourceTree = "<group>"; };
+		DCC31560076253A4008F7A48 /* fixed_coords.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = fixed_coords.hh; sourceTree = "<group>"; };
+		DCC31561076253A4008F7A48 /* functions.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = functions.hh; sourceTree = "<group>"; };
+		DCC31562076253A4008F7A48 /* genesis.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = genesis.cc; sourceTree = "<group>"; };
+		DCC31563076253A4008F7A48 /* genesis.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = genesis.hh; sourceTree = "<group>"; };
+		DCC31564076253A4008F7A48 /* help_alias.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_alias.cc; sourceTree = "<group>"; };
+		DCC31565076253A4008F7A48 /* help_alias.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_alias.hh; sourceTree = "<group>"; };
+		DCC31566076253A4008F7A48 /* help_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_entry.hh; sourceTree = "<group>"; };
+		DCC31567076253A4008F7A48 /* help_full_entry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_full_entry.hh; sourceTree = "<group>"; };
+		DCC31568076253A4008F7A48 /* help_manager.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_manager.cc; sourceTree = "<group>"; };
+		DCC31569076253A4008F7A48 /* help_manager.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_manager.hh; sourceTree = "<group>"; };
+		DCC3156A076253A4008F7A48 /* help_type.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = help_type.cc; sourceTree = "<group>"; };
+		DCC3156B076253A4008F7A48 /* help_type.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = help_type.hh; sourceTree = "<group>"; };
+		DCC3156C076253A4008F7A48 /* histogram.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = histogram.cc; sourceTree = "<group>"; };
+		DCC3156D076253A4008F7A48 /* histogram.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = histogram.hh; sourceTree = "<group>"; };
+		DCC3156E076253A4008F7A48 /* indexed_block_struct.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = indexed_block_struct.cc; sourceTree = "<group>"; };
+		DCC3156F076253A4008F7A48 /* indexed_block_struct.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = indexed_block_struct.hh; sourceTree = "<group>"; };
+		DCC31570076253A4008F7A48 /* init_file.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = init_file.cc; sourceTree = "<group>"; };
+		DCC31571076253A4008F7A48 /* init_file.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = init_file.hh; sourceTree = "<group>"; };
+		DCC31572076253A4008F7A48 /* int_sum.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = int_sum.cc; sourceTree = "<group>"; };
+		DCC31573076253A4008F7A48 /* int_sum.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = int_sum.hh; sourceTree = "<group>"; };
+		DCC31574076253A4008F7A48 /* integrated_schedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = integrated_schedule.cc; sourceTree = "<group>"; };
+		DCC31575076253A4008F7A48 /* integrated_schedule.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = integrated_schedule.hh; sourceTree = "<group>"; };
+		DCC31576076253A4008F7A48 /* integrated_schedule_node.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = integrated_schedule_node.cc; sourceTree = "<group>"; };
+		DCC31577076253A4008F7A48 /* integrated_schedule_node.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = integrated_schedule_node.hh; sourceTree = "<group>"; };
+		DCC31579076253A4008F7A48 /* merit.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = merit.cc; sourceTree = "<group>"; };
+		DCC3157A076253A4008F7A48 /* merit.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = merit.hh; sourceTree = "<group>"; };
+		DCC3157B076253A4008F7A48 /* message_class.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = message_class.hh; sourceTree = "<group>"; };
+		DCC3157C076253A4008F7A48 /* message_closure.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = message_closure.hh; sourceTree = "<group>"; };
+		DCC3157D076253A4008F7A48 /* message_display.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = message_display.cc; sourceTree = "<group>"; };
+		DCC3157E076253A4008F7A48 /* message_display.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = message_display.hh; sourceTree = "<group>"; };
+		DCC3157F076253A4008F7A48 /* message_display_hdrs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = message_display_hdrs.hh; sourceTree = "<group>"; };
+		DCC31580076253A4008F7A48 /* message_type.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = message_type.hh; sourceTree = "<group>"; };
+		DCC31581076253A4008F7A48 /* prob_schedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = prob_schedule.cc; sourceTree = "<group>"; };
+		DCC31582076253A4008F7A48 /* prob_schedule.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = prob_schedule.hh; sourceTree = "<group>"; };
+		DCC31583076253A4008F7A48 /* random.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = random.cc; sourceTree = "<group>"; };
+		DCC31584076253A4008F7A48 /* random.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = random.hh; sourceTree = "<group>"; };
+		DCC31585076253A4008F7A48 /* recursive_tests_decl_hdrs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = recursive_tests_decl_hdrs.hh; sourceTree = "<group>"; };
+		DCC31586076253A4008F7A48 /* recursive_tests_defn_hdrs.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = recursive_tests_defn_hdrs.hh; sourceTree = "<group>"; };
+		DCC31587076253A4008F7A48 /* recursive_tests_macros.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = recursive_tests_macros.hh; sourceTree = "<group>"; };
+		DCC31588076253A4008F7A48 /* ref_block.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ref_block.cc; sourceTree = "<group>"; };
+		DCC31589076253A4008F7A48 /* ref_block.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ref_block.hh; sourceTree = "<group>"; };
+		DCC3158A076253A4008F7A48 /* running_average.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = running_average.cc; sourceTree = "<group>"; };
+		DCC3158B076253A4008F7A48 /* running_average.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = running_average.hh; sourceTree = "<group>"; };
+		DCC3158C076253A4008F7A48 /* scaled_block.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = scaled_block.cc; sourceTree = "<group>"; };
+		DCC3158D076253A4008F7A48 /* scaled_block.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = scaled_block.hh; sourceTree = "<group>"; };
+		DCC3158E076253A4008F7A48 /* schedule.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = schedule.cc; sourceTree = "<group>"; };
+		DCC3158F076253A4008F7A48 /* schedule.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = schedule.hh; sourceTree = "<group>"; };
+		DCC31590076253A4008F7A48 /* string.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string.cc; sourceTree = "<group>"; };
+		DCC31591076253A4008F7A48 /* string.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = string.hh; sourceTree = "<group>"; };
+		DCC31592076253A4008F7A48 /* string_iterator.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_iterator.cc; sourceTree = "<group>"; };
+		DCC31593076253A4008F7A48 /* string_iterator.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = string_iterator.hh; sourceTree = "<group>"; };
+		DCC31594076253A4008F7A48 /* string_list.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_list.cc; sourceTree = "<group>"; };
+		DCC31595076253A4008F7A48 /* string_list.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = string_list.hh; sourceTree = "<group>"; };
+		DCC31596076253A4008F7A48 /* string_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = string_util.cc; sourceTree = "<group>"; };
+		DCC31597076253A4008F7A48 /* string_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = string_util.hh; sourceTree = "<group>"; };
+		DCC31598076253A4008F7A48 /* tArgDataEntry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tArgDataEntry.hh; sourceTree = "<group>"; };
+		DCC31599076253A4008F7A48 /* tArray.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tArray.hh; sourceTree = "<group>"; };
+		DCC3159A076253A4008F7A48 /* tBuffer.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tBuffer.hh; sourceTree = "<group>"; };
+		DCC3159B076253A4008F7A48 /* tDataEntry.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDataEntry.hh; sourceTree = "<group>"; };
+		DCC3159C076253A4008F7A48 /* tDataEntryBase.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDataEntryBase.hh; sourceTree = "<group>"; };
+		DCC3159D076253A4008F7A48 /* tDataEntryCommand.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDataEntryCommand.hh; sourceTree = "<group>"; };
+		DCC3159E076253A4008F7A48 /* tDataManager.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDataManager.hh; sourceTree = "<group>"; };
+		DCC3159F076253A4008F7A48 /* tDictionary.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tDictionary.hh; sourceTree = "<group>"; };
+		DCC315A5076253A4008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC315A6076253A4008F7A48 /* UnitTest_recursive_tests.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = UnitTest_recursive_tests.cc; sourceTree = "<group>"; };
+		DCC315A7076253A4008F7A48 /* tList.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tList.hh; sourceTree = "<group>"; };
+		DCC315A8076253A4008F7A48 /* tMatrix.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tMatrix.hh; sourceTree = "<group>"; };
+		DCC315A9076253A4008F7A48 /* tMemTrack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tMemTrack.hh; sourceTree = "<group>"; };
+		DCC315AA076253A4008F7A48 /* tools.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = tools.cc; sourceTree = "<group>"; };
+		DCC315AB076253A4008F7A48 /* tools.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tools.hh; sourceTree = "<group>"; };
+		DCC315AC076253A5008F7A48 /* tools.pri */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = tools.pri; sourceTree = "<group>"; };
+		DCC315AD076253A5008F7A48 /* tUnitTestSuite.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tUnitTestSuite.hh; sourceTree = "<group>"; };
+		DCC315AE076253A5008F7A48 /* tUnitTestSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tUnitTestSuiteRecurser.hh; sourceTree = "<group>"; };
+		DCC315AF076253A5008F7A48 /* tVector.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVector.hh; sourceTree = "<group>"; };
+		DCC315B0076253A5008F7A48 /* tVerifierSuite.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVerifierSuite.hh; sourceTree = "<group>"; };
+		DCC315B1076253A5008F7A48 /* tVerifierSuiteRecurser.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tVerifierSuiteRecurser.hh; sourceTree = "<group>"; };
+		DCC315B2076253A5008F7A48 /* uint.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = uint.hh; sourceTree = "<group>"; };
+		DCC315B3076253A5008F7A48 /* weighted_index.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = weighted_index.cc; sourceTree = "<group>"; };
+		DCC315B4076253A5008F7A48 /* weighted_index.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = weighted_index.hh; sourceTree = "<group>"; };
+		DCC315B5076253A5008F7A48 /* win32_mkdir_hack.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = win32_mkdir_hack.hh; sourceTree = "<group>"; };
+		DCC315BB076253A5008F7A48 /* fixHeaders.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; path = fixHeaders.py; sourceTree = "<group>"; };
+		DCC315C1076253A5008F7A48 /* hist_map.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hist_map.cc; sourceTree = "<group>"; };
+		DCC315C2076253A5008F7A48 /* hist_map2.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hist_map2.cc; sourceTree = "<group>"; };
+		DCC315C3076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		DCC315C4076253A5008F7A48 /* matlabify.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = matlabify.cc; sourceTree = "<group>"; };
+		DCC315CD076253A5008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC315CE076253A5008F7A48 /* environment.rotate */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = environment.rotate; sourceTree = "<group>"; };
+		DCC315CF076253A5008F7A48 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
+		DCC315D0076253A5008F7A48 /* task_event_gen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.cc; sourceTree = "<group>"; };
+		DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = task_event_gen.old.cc; sourceTree = "<group>"; };
+		DCC315F6076253A5008F7A48 /* ansi.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ansi.cc; sourceTree = "<group>"; };
+		DCC315F7076253A5008F7A48 /* ansi.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ansi.hh; sourceTree = "<group>"; };
+		DCC315F8076253A5008F7A48 /* bar_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = bar_screen.cc; sourceTree = "<group>"; };
+		DCC315F9076253A5008F7A48 /* bar_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = bar_screen.hh; sourceTree = "<group>"; };
+		DCC315FA076253A5008F7A48 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; };
+		DCC315FB076253A5008F7A48 /* environment_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = environment_screen.cc; sourceTree = "<group>"; };
+		DCC315FC076253A5008F7A48 /* environment_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = environment_screen.hh; sourceTree = "<group>"; };
+		DCC315FD076253A5008F7A48 /* hist_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hist_screen.cc; sourceTree = "<group>"; };
+		DCC315FE076253A5008F7A48 /* hist_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hist_screen.hh; sourceTree = "<group>"; };
+		DCC315FF076253A5008F7A48 /* key_chart */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = key_chart; sourceTree = "<group>"; };
+		DCC31601076253A5008F7A48 /* map_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = map_screen.cc; sourceTree = "<group>"; };
+		DCC31602076253A5008F7A48 /* map_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = map_screen.hh; sourceTree = "<group>"; };
+		DCC31603076253A5008F7A48 /* menu.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = menu.cc; sourceTree = "<group>"; };
+		DCC31604076253A5008F7A48 /* menu.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = menu.hh; sourceTree = "<group>"; };
+		DCC31605076253A5008F7A48 /* ncurses.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ncurses.cc; sourceTree = "<group>"; };
+		DCC31606076253A5008F7A48 /* ncurses.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ncurses.hh; sourceTree = "<group>"; };
+		DCC31607076253A5008F7A48 /* options_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = options_screen.cc; sourceTree = "<group>"; };
+		DCC31608076253A5008F7A48 /* options_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = options_screen.hh; sourceTree = "<group>"; };
+		DCC31609076253A5008F7A48 /* stats_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = stats_screen.cc; sourceTree = "<group>"; };
+		DCC3160A076253A5008F7A48 /* stats_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = stats_screen.hh; sourceTree = "<group>"; };
+		DCC3160B076253A5008F7A48 /* symbol_util.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = symbol_util.cc; sourceTree = "<group>"; };
+		DCC3160C076253A5008F7A48 /* symbol_util.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = symbol_util.hh; sourceTree = "<group>"; };
+		DCC3160D076253A5008F7A48 /* text_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = text_screen.cc; sourceTree = "<group>"; };
+		DCC3160E076253A5008F7A48 /* text_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = text_screen.hh; sourceTree = "<group>"; };
+		DCC3160F076253A5008F7A48 /* text_window.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = text_window.hh; sourceTree = "<group>"; };
+		DCC31610076253A5008F7A48 /* view.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = view.cc; sourceTree = "<group>"; };
+		DCC31611076253A5008F7A48 /* view.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = view.hh; sourceTree = "<group>"; };
+		DCC31612076253A5008F7A48 /* viewer.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = viewer.cc; sourceTree = "<group>"; };
+		DCC31613076253A5008F7A48 /* viewer.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = viewer.hh; sourceTree = "<group>"; };
+		DCC31614076253A5008F7A48 /* viewers.pro */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = viewers.pro; sourceTree = "<group>"; };
+		DCC31615076253A5008F7A48 /* zoom_screen.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zoom_screen.cc; sourceTree = "<group>"; };
+		DCC31616076253A5008F7A48 /* zoom_screen.hh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = zoom_screen.hh; sourceTree = "<group>"; };
+		DCC3164D07626CF3008F7A48 /* primitive */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = primitive; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		DCC3164B07626CF3008F7A48 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
 			);
+			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DCC30C670762539A008F7A48 = {
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		DCC30C490762532C008F7A48 = {
+			isa = PBXGroup;
 			children = (
-				DCC30C710762539A008F7A48,
-				DCC30F7B0762539D008F7A48,
-				DCC30F7C0762539D008F7A48,
-				DCC30FCE0762539D008F7A48,
-				DCC30FCF0762539D008F7A48,
-				DCC30FD00762539D008F7A48,
-				DCC310030762539D008F7A48,
-				DCC310040762539D008F7A48,
-				DCC311380762539E008F7A48,
-				DCC311390762539E008F7A48,
-				DCC3113A0762539E008F7A48,
-				DCC311990762539F008F7A48,
-				DCC31340076253A0008F7A48,
-				DCC314D8076253A2008F7A48,
-				DCC315B6076253A5008F7A48,
-				DCC315D2076253A5008F7A48,
+				703F684207B437B800C1CA76 /* status.xml */,
+				DCC30C670762539A008F7A48 /* source */,
+				DCC3164E07626CF3008F7A48 /* Products */,
 			);
+			sourceTree = "<group>";
+		};
+		DCC30C670762539A008F7A48 /* source */ = {
 			isa = PBXGroup;
+			children = (
+				DCC30C710762539A008F7A48 /* bindings */,
+				DCC30F7B0762539D008F7A48 /* CMakeLists.txt */,
+				DCC30F7C0762539D008F7A48 /* cpu */,
+				DCC30FCE0762539D008F7A48 /* defs.hh */,
+				DCC30FCF0762539D008F7A48 /* Doxyfile */,
+				DCC30FD00762539D008F7A48 /* event */,
+				DCC310030762539D008F7A48 /* LEVELS */,
+				DCC310040762539D008F7A48 /* main */,
+				DCC311380762539E008F7A48 /* MAP.renamed_to_avoid_naming_conflict_with_stl */,
+				DCC311390762539E008F7A48 /* modules.pri */,
+				DCC3113A0762539E008F7A48 /* support */,
+				DCC311990762539F008F7A48 /* testsuites */,
+				DCC31340076253A0008F7A48 /* third-party */,
+				DCC314D8076253A2008F7A48 /* tools */,
+				DCC315B6076253A5008F7A48 /* utils */,
+				DCC315D2076253A5008F7A48 /* viewers */,
+			);
 			path = source;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30C710762539A008F7A48 = {
+		DCC30C710762539A008F7A48 /* bindings */ = {
+			isa = PBXGroup;
 			children = (
-				DCC30C750762539A008F7A48,
-				DCC30F7A0762539D008F7A48,
+				DCC30C750762539A008F7A48 /* Boost.Python */,
+				DCC30F7A0762539D008F7A48 /* CMakeLists.txt */,
 			);
-			isa = PBXGroup;
 			path = bindings;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30C750762539A008F7A48 = {
+		DCC30C750762539A008F7A48 /* Boost.Python */ = {
+			isa = PBXGroup;
 			children = (
-				DCC30D300762539B008F7A48,
-				DCC30D310762539B008F7A48,
-				DCC30D320762539B008F7A48,
-				DCC30D330762539B008F7A48,
-				DCC30D340762539B008F7A48,
-				DCC30D350762539B008F7A48,
-				DCC30D360762539B008F7A48,
-				DCC30D370762539B008F7A48,
-				DCC30D380762539B008F7A48,
-				DCC30D390762539B008F7A48,
-				DCC30D3A0762539B008F7A48,
-				DCC30D3B0762539B008F7A48,
-				DCC30D3C0762539B008F7A48,
-				DCC30D3D0762539B008F7A48,
-				DCC30D3E0762539B008F7A48,
-				DCC30D3F0762539B008F7A48,
-				DCC30D400762539B008F7A48,
-				DCC30D410762539B008F7A48,
-				DCC30D420762539B008F7A48,
-				DCC30D430762539B008F7A48,
-				DCC30D850762539B008F7A48,
-				DCC30ED70762539D008F7A48,
-				DCC30ED80762539D008F7A48,
-				DCC30ED90762539D008F7A48,
-				DCC30EDA0762539D008F7A48,
-				DCC30EDE0762539D008F7A48,
-				DCC30EDF0762539D008F7A48,
-				DCC30EE00762539D008F7A48,
-				DCC30EE10762539D008F7A48,
-				DCC30EE20762539D008F7A48,
-				DCC30EE30762539D008F7A48,
-				DCC30EE40762539D008F7A48,
-				DCC30EE50762539D008F7A48,
-				DCC30EE60762539D008F7A48,
-				DCC30EE70762539D008F7A48,
-				DCC30EE80762539D008F7A48,
-				DCC30EE90762539D008F7A48,
-				DCC30EEA0762539D008F7A48,
-				DCC30EEB0762539D008F7A48,
-				DCC30EEC0762539D008F7A48,
-				DCC30EED0762539D008F7A48,
-				DCC30EEE0762539D008F7A48,
-				DCC30EEF0762539D008F7A48,
-				DCC30EF00762539D008F7A48,
-				DCC30EF10762539D008F7A48,
-				DCC30EF20762539D008F7A48,
-				DCC30EF30762539D008F7A48,
-				DCC30EF40762539D008F7A48,
-				DCC30EF50762539D008F7A48,
-				DCC30EF60762539D008F7A48,
-				DCC30EF70762539D008F7A48,
-				DCC30EF80762539D008F7A48,
-				DCC30EF90762539D008F7A48,
-				DCC30EFA0762539D008F7A48,
-				DCC30EFB0762539D008F7A48,
-				DCC30EFC0762539D008F7A48,
-				DCC30EFD0762539D008F7A48,
-				DCC30EFE0762539D008F7A48,
-				DCC30EFF0762539D008F7A48,
-				DCC30F000762539D008F7A48,
-				DCC30F010762539D008F7A48,
-				DCC30F020762539D008F7A48,
-				DCC30F030762539D008F7A48,
-				DCC30F040762539D008F7A48,
-				DCC30F050762539D008F7A48,
-				DCC30F060762539D008F7A48,
-				DCC30F070762539D008F7A48,
-				DCC30F080762539D008F7A48,
-				DCC30F090762539D008F7A48,
-				DCC30F0A0762539D008F7A48,
-				DCC30F0B0762539D008F7A48,
-				DCC30F0C0762539D008F7A48,
-				DCC30F0D0762539D008F7A48,
-				DCC30F0E0762539D008F7A48,
-				DCC30F0F0762539D008F7A48,
-				DCC30F100762539D008F7A48,
-				DCC30F110762539D008F7A48,
-				DCC30F120762539D008F7A48,
-				DCC30F130762539D008F7A48,
-				DCC30F140762539D008F7A48,
-				DCC30F150762539D008F7A48,
-				DCC30F160762539D008F7A48,
-				DCC30F170762539D008F7A48,
-				DCC30F180762539D008F7A48,
-				DCC30F190762539D008F7A48,
-				DCC30F1A0762539D008F7A48,
-				DCC30F1B0762539D008F7A48,
-				DCC30F1C0762539D008F7A48,
-				DCC30F1D0762539D008F7A48,
-				DCC30F1E0762539D008F7A48,
-				DCC30F1F0762539D008F7A48,
-				DCC30F200762539D008F7A48,
-				DCC30F210762539D008F7A48,
-				DCC30F220762539D008F7A48,
-				DCC30F230762539D008F7A48,
-				DCC30F240762539D008F7A48,
-				DCC30F250762539D008F7A48,
-				DCC30F260762539D008F7A48,
-				DCC30F270762539D008F7A48,
-				DCC30F280762539D008F7A48,
-				DCC30F290762539D008F7A48,
-				DCC30F2A0762539D008F7A48,
-				DCC30F2B0762539D008F7A48,
-				DCC30F2C0762539D008F7A48,
-				DCC30F2D0762539D008F7A48,
-				DCC30F2E0762539D008F7A48,
-				DCC30F2F0762539D008F7A48,
-				DCC30F300762539D008F7A48,
-				DCC30F310762539D008F7A48,
-				DCC30F320762539D008F7A48,
-				DCC30F330762539D008F7A48,
-				DCC30F340762539D008F7A48,
-				DCC30F350762539D008F7A48,
-				DCC30F360762539D008F7A48,
-				DCC30F370762539D008F7A48,
-				DCC30F380762539D008F7A48,
-				DCC30F390762539D008F7A48,
-				DCC30F3A0762539D008F7A48,
-				DCC30F3B0762539D008F7A48,
-				DCC30F3C0762539D008F7A48,
-				DCC30F3D0762539D008F7A48,
-				DCC30F3E0762539D008F7A48,
-				DCC30F3F0762539D008F7A48,
-				DCC30F400762539D008F7A48,
-				DCC30F410762539D008F7A48,
-				DCC30F430762539D008F7A48,
-				DCC30F440762539D008F7A48,
-				DCC30F450762539D008F7A48,
-				DCC30F460762539D008F7A48,
-				DCC30F470762539D008F7A48,
-				DCC30F480762539D008F7A48,
-				DCC30F490762539D008F7A48,
-				DCC30F4A0762539D008F7A48,
-				DCC30F4B0762539D008F7A48,
-				DCC30F4C0762539D008F7A48,
-				DCC30F4D0762539D008F7A48,
-				DCC30F4E0762539D008F7A48,
-				DCC30F4F0762539D008F7A48,
-				DCC30F500762539D008F7A48,
-				DCC30F510762539D008F7A48,
-				DCC30F520762539D008F7A48,
-				DCC30F530762539D008F7A48,
-				DCC30F540762539D008F7A48,
-				DCC30F550762539D008F7A48,
-				DCC30F560762539D008F7A48,
-				DCC30F570762539D008F7A48,
-				DCC30F580762539D008F7A48,
-				DCC30F590762539D008F7A48,
-				DCC30F5A0762539D008F7A48,
-				DCC30F5B0762539D008F7A48,
-				DCC30F5C0762539D008F7A48,
-				DCC30F5D0762539D008F7A48,
-				DCC30F5E0762539D008F7A48,
-				DCC30F5F0762539D008F7A48,
-				DCC30F600762539D008F7A48,
-				DCC30F610762539D008F7A48,
-				DCC30F620762539D008F7A48,
-				DCC30F630762539D008F7A48,
-				DCC30F640762539D008F7A48,
-				DCC30F650762539D008F7A48,
-				DCC30F660762539D008F7A48,
-				DCC30F670762539D008F7A48,
-				DCC30F680762539D008F7A48,
-				DCC30F690762539D008F7A48,
-				DCC30F6A0762539D008F7A48,
-				DCC30F6B0762539D008F7A48,
-				DCC30F6C0762539D008F7A48,
-				DCC30F6D0762539D008F7A48,
-				DCC30F6E0762539D008F7A48,
-				DCC30F6F0762539D008F7A48,
-				DCC30F700762539D008F7A48,
-				DCC30F710762539D008F7A48,
-				DCC30F720762539D008F7A48,
-				DCC30F730762539D008F7A48,
-				DCC30F740762539D008F7A48,
-				DCC30F750762539D008F7A48,
-				DCC30F760762539D008F7A48,
-				DCC30F770762539D008F7A48,
-				DCC30F780762539D008F7A48,
-				DCC30F790762539D008F7A48,
+				DCC30D300762539B008F7A48 /* 4stack_head.pyste */,
+				DCC30D310762539B008F7A48 /* A.hh */,
+				DCC30D320762539B008F7A48 /* A.pyste */,
+				DCC30D330762539B008F7A48 /* AB.cc */,
+				DCC30D340762539B008F7A48 /* analyze.pyste */,
+				DCC30D350762539B008F7A48 /* analyze_command.pyste */,
+				DCC30D360762539B008F7A48 /* analyze_command_def.pyste */,
+				DCC30D370762539B008F7A48 /* analyze_command_def_base.pyste */,
+				DCC30D380762539B008F7A48 /* analyze_flow_command.pyste */,
+				DCC30D390762539B008F7A48 /* analyze_flow_command_def.pyste */,
+				DCC30D3A0762539B008F7A48 /* analyze_function.pyste */,
+				DCC30D3B0762539B008F7A48 /* analyze_genotype.pyste */,
+				DCC30D3C0762539B008F7A48 /* analyze_util.pyste */,
+				DCC30D3D0762539B008F7A48 /* avida-fixups.hh */,
+				DCC30D3E0762539B008F7A48 /* avida.pyste */,
+				DCC30D3F0762539B008F7A48 /* avida_driver_analyze.pyste */,
+				DCC30D400762539B008F7A48 /* avida_driver_base.pyste */,
+				DCC30D410762539B008F7A48 /* avida_driver_population.pyste */,
+				DCC30D420762539B008F7A48 /* avida_triggers.pyste */,
+				DCC30D430762539B008F7A48 /* AvidaGui */,
+				DCC30D850762539B008F7A48 /* AvidaGui2 */,
+				DCC30ED70762539D008F7A48 /* B.hh */,
+				DCC30ED80762539D008F7A48 /* B.pyste */,
+				DCC30ED90762539D008F7A48 /* birth_chamber.pyste */,
+				DCC30EDA0762539D008F7A48 /* block_struct.pyste */,
+				DCC30EDE0762539D008F7A48 /* callback_util.pyste */,
+				DCC30EDF0762539D008F7A48 /* cCycleCheck.pyste */,
+				DCC30EE00762539D008F7A48 /* cID.pyste */,
+				DCC30EE10762539D008F7A48 /* cmake_entries */,
+				DCC30EE20762539D008F7A48 /* CMakeLists.txt */,
+				DCC30EE30762539D008F7A48 /* code_label.pyste */,
+				DCC30EE40762539D008F7A48 /* config.pyste */,
+				DCC30EE50762539D008F7A48 /* const_schedule.pyste */,
+				DCC30EE60762539D008F7A48 /* count_tracker.pyste */,
+				DCC30EE70762539D008F7A48 /* cpu_head.pyste */,
+				DCC30EE80762539D008F7A48 /* cpu_memory.pyste */,
+				DCC30EE90762539D008F7A48 /* cpu_stack.pyste */,
+				DCC30EEA0762539D008F7A48 /* cpu_stats.pyste */,
+				DCC30EEB0762539D008F7A48 /* cpu_test_info.pyste */,
+				DCC30EEC0762539D008F7A48 /* cStringable.pyste */,
+				DCC30EED0762539D008F7A48 /* cTestCase.pyste */,
+				DCC30EEE0762539D008F7A48 /* cTestProblem.pyste */,
+				DCC30EEF0762539D008F7A48 /* cTestResult.pyste */,
+				DCC30EF00762539D008F7A48 /* cTextTestInterpreter.pyste */,
+				DCC30EF10762539D008F7A48 /* data_entry.pyste */,
+				DCC30EF20762539D008F7A48 /* data_file.pyste */,
+				DCC30EF30762539D008F7A48 /* data_file_manager.pyste */,
+				DCC30EF40762539D008F7A48 /* data_manager_base.pyste */,
+				DCC30EF50762539D008F7A48 /* double_sum.pyste */,
+				DCC30EF60762539D008F7A48 /* environment.pyste */,
+				DCC30EF70762539D008F7A48 /* event.pyste */,
+				DCC30EF80762539D008F7A48 /* event_factory.pyste */,
+				DCC30EF90762539D008F7A48 /* event_factory_manager.pyste */,
+				DCC30EFA0762539D008F7A48 /* event_list.pyste */,
+				DCC30EFB0762539D008F7A48 /* event_list_entry.pyste */,
+				DCC30EFC0762539D008F7A48 /* event_list_iterator.pyste */,
+				DCC30EFD0762539D008F7A48 /* event_triggers.pyste */,
+				DCC30EFE0762539D008F7A48 /* file-fixups.cc */,
+				DCC30EFF0762539D008F7A48 /* file-fixups.hh */,
+				DCC30F000762539D008F7A48 /* file.pyste */,
+				DCC30F010762539D008F7A48 /* fitness_matrix.pyste */,
+				DCC30F020762539D008F7A48 /* fixed_block.pyste */,
+				DCC30F030762539D008F7A48 /* fixed_coords.pyste */,
+				DCC30F040762539D008F7A48 /* genebank.pyste */,
+				DCC30F050762539D008F7A48 /* generatePysteFiles.py */,
+				DCC30F060762539D008F7A48 /* genesis-fixups.cc */,
+				DCC30F070762539D008F7A48 /* genesis-fixups.hh */,
+				DCC30F080762539D008F7A48 /* genesis.pyste */,
+				DCC30F090762539D008F7A48 /* genome.pyste */,
+				DCC30F0A0762539D008F7A48 /* genome_util.pyste */,
+				DCC30F0B0762539D008F7A48 /* genotype.pyste */,
+				DCC30F0C0762539D008F7A48 /* genotype_batch.pyste */,
+				DCC30F0D0762539D008F7A48 /* genotype_birth_data.pyste */,
+				DCC30F0E0762539D008F7A48 /* genotype_control.pyste */,
+				DCC30F0F0762539D008F7A48 /* genotype_test_data.pyste */,
+				DCC30F100762539D008F7A48 /* getting_started1.cpp */,
+				DCC30F110762539D008F7A48 /* getting_started2.cpp */,
+				DCC30F120762539D008F7A48 /* hardware_4stack.pyste */,
+				DCC30F130762539D008F7A48 /* hardware_4stack_thread.pyste */,
+				DCC30F140762539D008F7A48 /* hardware_base.pyste */,
+				DCC30F150762539D008F7A48 /* hardware_cpu-fixups.cc */,
+				DCC30F160762539D008F7A48 /* hardware_cpu-fixups.hh */,
+				DCC30F170762539D008F7A48 /* hardware_cpu.pyste */,
+				DCC30F180762539D008F7A48 /* hardware_cpu_thread.pyste */,
+				DCC30F190762539D008F7A48 /* hardware_factory.pyste */,
+				DCC30F1A0762539D008F7A48 /* hardware_util.pyste */,
+				DCC30F1B0762539D008F7A48 /* help_alias.pyste */,
+				DCC30F1C0762539D008F7A48 /* help_entry.pyste */,
+				DCC30F1D0762539D008F7A48 /* help_full_entry.pyste */,
+				DCC30F1E0762539D008F7A48 /* help_manager.pyste */,
+				DCC30F1F0762539D008F7A48 /* help_type.pyste */,
+				DCC30F200762539D008F7A48 /* histogram.pyste */,
+				DCC30F210762539D008F7A48 /* indexed_block_struct.pyste */,
+				DCC30F220762539D008F7A48 /* init_file.pyste */,
+				DCC30F230762539D008F7A48 /* inject_genebank.pyste */,
+				DCC30F240762539D008F7A48 /* inject_genotype.pyste */,
+				DCC30F250762539D008F7A48 /* inject_genotype_birth_data.pyste */,
+				DCC30F260762539D008F7A48 /* inject_genotype_control.pyste */,
+				DCC30F270762539D008F7A48 /* inject_genotype_element.pyste */,
+				DCC30F280762539D008F7A48 /* inject_genotype_queue.pyste */,
+				DCC30F290762539D008F7A48 /* inst_lib_base.pyste */,
+				DCC30F2A0762539D008F7A48 /* inst_lib_cpu.pyste */,
+				DCC30F2B0762539D008F7A48 /* inst_set.pyste */,
+				DCC30F2C0762539D008F7A48 /* inst_util.pyste */,
+				DCC30F2D0762539D008F7A48 /* instruction.pyste */,
+				DCC30F2E0762539D008F7A48 /* int_sum.pyste */,
+				DCC30F2F0762539D008F7A48 /* integrated_schedule.pyste */,
+				DCC30F300762539D008F7A48 /* integrated_schedule_node.pyste */,
+				DCC30F310762539D008F7A48 /* kaben_brainstorms.cc */,
+				DCC30F320762539D008F7A48 /* kaben_brainstorms.cpp */,
+				DCC30F330762539D008F7A48 /* kaben_brainstorms.pyste */,
+				DCC30F340762539D008F7A48 /* landscape.pyste */,
+				DCC30F350762539D008F7A48 /* lineage.pyste */,
+				DCC30F360762539D008F7A48 /* lineage_control.pyste */,
+				DCC30F370762539D008F7A48 /* local_mutations.pyste */,
+				DCC30F380762539D008F7A48 /* memory_flags.pyste */,
+				DCC30F390762539D008F7A48 /* merit.pyste */,
+				DCC30F3A0762539D008F7A48 /* mutation.pyste */,
+				DCC30F3B0762539D008F7A48 /* mutation_lib.pyste */,
+				DCC30F3C0762539D008F7A48 /* mutation_rates.pyste */,
+				DCC30F3D0762539D008F7A48 /* mx_code_array.pyste */,
+				DCC30F3E0762539D008F7A48 /* my_code_array_less_than.pyste */,
+				DCC30F3F0762539D008F7A48 /* org_message.pyste */,
+				DCC30F400762539D008F7A48 /* organism.pyste */,
+				DCC30F410762539D008F7A48 /* phenotype.pyste */,
+				DCC30F430762539D008F7A48 /* population.pyste */,
+				DCC30F440762539D008F7A48 /* population_cell.pyste */,
+				DCC30F450762539D008F7A48 /* population_event.pyste */,
+				DCC30F460762539D008F7A48 /* population_event_factory.pyste */,
+				DCC30F470762539D008F7A48 /* population_interface-fixups.hh */,
+				DCC30F480762539D008F7A48 /* population_interface.pyste */,
+				DCC30F490762539D008F7A48 /* prob_schedule.pyste */,
+				DCC30F4A0762539D008F7A48 /* py_avida_driver-fixups.cc */,
+				DCC30F4B0762539D008F7A48 /* py_avida_driver.hh */,
+				DCC30F4C0762539D008F7A48 /* py_avida_driver.pyste */,
+				DCC30F4D0762539D008F7A48 /* py_doctest_driver.py */,
+				DCC30F4E0762539D008F7A48 /* py_kaben_brainstorms_t.py */,
+				DCC30F4F0762539D008F7A48 /* py_unittest_driver.py */,
+				DCC30F500762539D008F7A48 /* random.pyste */,
+				DCC30F510762539D008F7A48 /* reaction.pyste */,
+				DCC30F520762539D008F7A48 /* reaction_lib.pyste */,
+				DCC30F530762539D008F7A48 /* reaction_process.pyste */,
+				DCC30F540762539D008F7A48 /* reaction_requisite.pyste */,
+				DCC30F550762539D008F7A48 /* reaction_result.pyste */,
+				DCC30F560762539D008F7A48 /* ref_block.pyste */,
+				DCC30F570762539D008F7A48 /* resource.pyste */,
+				DCC30F580762539D008F7A48 /* resource_count.pyste */,
+				DCC30F590762539D008F7A48 /* resource_lib.pyste */,
+				DCC30F5A0762539D008F7A48 /* running_average.pyste */,
+				DCC30F5B0762539D008F7A48 /* scaled_block.pyste */,
+				DCC30F5C0762539D008F7A48 /* schedule.pyste */,
+				DCC30F5D0762539D008F7A48 /* spatial_count_elem.pyste */,
+				DCC30F5E0762539D008F7A48 /* spatial_res_count.pyste */,
+				DCC30F5F0762539D008F7A48 /* species.pyste */,
+				DCC30F600762539D008F7A48 /* species_control.pyste */,
+				DCC30F610762539D008F7A48 /* species_queue.pyste */,
+				DCC30F620762539D008F7A48 /* stats.pyste */,
+				DCC30F630762539D008F7A48 /* string.pyste */,
+				DCC30F640762539D008F7A48 /* string_iterator.pyste */,
+				DCC30F650762539D008F7A48 /* string_list.pyste */,
+				DCC30F660762539D008F7A48 /* string_util.pyste */,
+				DCC30F670762539D008F7A48 /* tArray.pyste */,
+				DCC30F680762539D008F7A48 /* tArray_instantiations.hh */,
+				DCC30F690762539D008F7A48 /* task_entry.pyste */,
+				DCC30F6A0762539D008F7A48 /* task_lib.pyste */,
+				DCC30F6B0762539D008F7A48 /* tBuffer.pyste */,
+				DCC30F6C0762539D008F7A48 /* tBuffer_instantiations.hh */,
+				DCC30F6D0762539D008F7A48 /* tDictionary.pyste */,
+				DCC30F6E0762539D008F7A48 /* tDictionary_instantiations.hh */,
+				DCC30F6F0762539D008F7A48 /* test_cpu.pyste */,
+				DCC30F700762539D008F7A48 /* test_getting_started1.py */,
+				DCC30F710762539D008F7A48 /* test_getting_started2.py */,
+				DCC30F720762539D008F7A48 /* test_util.pyste */,
+				DCC30F730762539D008F7A48 /* tList.pyste */,
+				DCC30F740762539D008F7A48 /* tList_instantiations.hh */,
+				DCC30F750762539D008F7A48 /* tMatrix.pyste */,
+				DCC30F760762539D008F7A48 /* tMatrix_instantiations.hh */,
+				DCC30F770762539D008F7A48 /* tools.pyste */,
+				DCC30F780762539D008F7A48 /* uint.pyste */,
+				DCC30F790762539D008F7A48 /* weighted_index.pyste */,
 			);
-			isa = PBXGroup;
 			path = Boost.Python;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30D300762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = 4stack_head.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D310762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = A.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D320762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = A.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D330762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = AB.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D340762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D350762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_command.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D360762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_command_def.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D370762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_command_def_base.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D380762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_flow_command.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D390762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_flow_command_def.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3A0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_function.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3B0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_genotype.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3C0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3D0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = "avida-fixups.hh";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3E0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = avida.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D3F0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = avida_driver_analyze.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D400762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = avida_driver_base.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D410762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = avida_driver_population.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D420762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = avida_triggers.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D430762539B008F7A48 = {
+		DCC30D430762539B008F7A48 /* AvidaGui */ = {
+			isa = PBXGroup;
 			children = (
-				DCC30D640762539B008F7A48,
-				DCC30D670762539B008F7A48,
-				DCC30D680762539B008F7A48,
-				DCC30D690762539B008F7A48,
-				DCC30D6A0762539B008F7A48,
-				DCC30D6B0762539B008F7A48,
-				DCC30D6C0762539B008F7A48,
-				DCC30D6D0762539B008F7A48,
-				DCC30D6E0762539B008F7A48,
-				DCC30D6F0762539B008F7A48,
-				DCC30D700762539B008F7A48,
-				DCC30D710762539B008F7A48,
-				DCC30D720762539B008F7A48,
-				DCC30D730762539B008F7A48,
-				DCC30D740762539B008F7A48,
-				DCC30D750762539B008F7A48,
-				DCC30D760762539B008F7A48,
-				DCC30D770762539B008F7A48,
-				DCC30D780762539B008F7A48,
-				DCC30D790762539B008F7A48,
-				DCC30D7A0762539B008F7A48,
-				DCC30D7B0762539B008F7A48,
-				DCC30D7C0762539B008F7A48,
-				DCC30D7D0762539B008F7A48,
-				DCC30D7E0762539B008F7A48,
-				DCC30D7F0762539B008F7A48,
-				DCC30D800762539B008F7A48,
-				DCC30D810762539B008F7A48,
-				DCC30D820762539B008F7A48,
-				DCC30D830762539B008F7A48,
-				DCC30D840762539B008F7A48,
+				DCC30D640762539B008F7A48 /* 0 */,
+				DCC30D670762539B008F7A48 /* __init__.py */,
+				DCC30D680762539B008F7A48 /* buildapp.py */,
+				DCC30D690762539B008F7A48 /* FunctionalTest_recursive_tests.py */,
+				DCC30D6A0762539B008F7A48 /* py_avida_core_data.py */,
+				DCC30D6B0762539B008F7A48 /* py_avida_driver_controller.py */,
+				DCC30D6C0762539B008F7A48 /* py_avida_state_mediator.py */,
+				DCC30D6D0762539B008F7A48 /* py_avida_threaded_driver.py */,
+				DCC30D6E0762539B008F7A48 /* py_brainstorms.py */,
+				DCC30D6F0762539B008F7A48 /* py_main_controller_data.py */,
+				DCC30D700762539B008F7A48 /* pyEduMainCtrl.py */,
+				DCC30D710762539B008F7A48 /* pyMdl.py */,
+				DCC30D720762539B008F7A48 /* pySessionCtrl.py */,
+				DCC30D730762539B008F7A48 /* pySessionCtrl.py.1 */,
+				DCC30D740762539B008F7A48 /* pySessionDumbCtrl.py.1 */,
+				DCC30D750762539B008F7A48 /* pySessionWorkThreadHdlr.py.0 */,
+				DCC30D760762539B008F7A48 /* pySessionWorkThreadHdlr.py.1 */,
+				DCC30D770762539B008F7A48 /* pyTemporaryReloads.py */,
+				DCC30D780762539B008F7A48 /* UnitTest_pyAvidaCoreData.py */,
+				DCC30D790762539B008F7A48 /* UnitTest_pyAvidaThreadedDriver.py */,
+				DCC30D7A0762539B008F7A48 /* UnitTest_pyEduMainCtrl.py */,
+				DCC30D7B0762539B008F7A48 /* UnitTest_pyEduMainMenuBarHdlr.py */,
+				DCC30D7C0762539B008F7A48 /* UnitTest_pyEduSessionMenuBarHdlr.py */,
+				DCC30D7D0762539B008F7A48 /* UnitTest_pyMainControllerFactory.py */,
+				DCC30D7E0762539B008F7A48 /* UnitTest_pyMdl.py */,
+				DCC30D7F0762539B008F7A48 /* UnitTest_pyMdtr.py */,
+				DCC30D800762539B008F7A48 /* UnitTest_pySessionControllerFactory.py */,
+				DCC30D810762539B008F7A48 /* UnitTest_pySessionCtrl.py */,
+				DCC30D820762539B008F7A48 /* UnitTest_pySessionDumbCtrl.py */,
+				DCC30D830762539B008F7A48 /* UnitTest_pySessionDumbView.py */,
+				DCC30D840762539B008F7A48 /* UnitTest_pySessionWorkThreadHdlr.py */,
 			);
-			isa = PBXGroup;
 			path = AvidaGui;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30D640762539B008F7A48 = {
+		DCC30D640762539B008F7A48 /* 0 */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = 0;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30D670762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = __init__.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D680762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = buildapp.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D690762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = FunctionalTest_recursive_tests.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6A0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_avida_core_data.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6B0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_avida_driver_controller.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6C0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_avida_state_mediator.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6D0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_avida_threaded_driver.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6E0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_brainstorms.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D6F0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_main_controller_data.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D700762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = pyEduMainCtrl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D710762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = pyMdl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D720762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = pySessionCtrl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D730762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.man;
-			path = pySessionCtrl.py.1;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D740762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.man;
-			path = pySessionDumbCtrl.py.1;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D750762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = pySessionWorkThreadHdlr.py.0;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D760762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.man;
-			path = pySessionWorkThreadHdlr.py.1;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D770762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = pyTemporaryReloads.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D780762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyAvidaCoreData.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D790762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyAvidaThreadedDriver.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7A0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyEduMainCtrl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7B0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyEduMainMenuBarHdlr.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7C0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyEduSessionMenuBarHdlr.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7D0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyMainControllerFactory.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7E0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyMdl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D7F0762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pyMdtr.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D800762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pySessionControllerFactory.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D810762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pySessionCtrl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D820762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pySessionDumbCtrl.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D830762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pySessionDumbView.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D840762539B008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = UnitTest_pySessionWorkThreadHdlr.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30D850762539B008F7A48 = {
+		DCC30D850762539B008F7A48 /* AvidaGui2 */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = AvidaGui2;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30ED70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = B.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30ED80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = B.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30ED90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = birth_chamber.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EDA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = block_struct.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EDE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = callback_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EDF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cCycleCheck.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE00762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cID.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE10762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cmake_entries;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE20762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE30762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = code_label.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE40762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = config.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE50762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = const_schedule.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE60762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = count_tracker.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu_head.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu_memory.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EE90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu_stack.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EEA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu_stats.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EEB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu_test_info.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EEC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cStringable.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EED0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cTestCase.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EEE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cTestProblem.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EEF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cTestResult.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF00762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cTextTestInterpreter.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF10762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = data_entry.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF20762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = data_file.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF30762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = data_file_manager.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF40762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = data_manager_base.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF50762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = double_sum.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF60762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_factory.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EF90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_factory_manager.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_list.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_list_entry.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_list_iterator.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFD0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event_triggers.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = "file-fixups.cc";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30EFF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = "file-fixups.hh";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F000762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = file.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F010762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = fitness_matrix.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F020762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = fixed_block.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F030762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = fixed_coords.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F040762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genebank.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F050762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = generatePysteFiles.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F060762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = "genesis-fixups.cc";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F070762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = "genesis-fixups.hh";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F080762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F090762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genome.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genome_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genotype.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genotype_batch.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genotype_birth_data.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genotype_control.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F0F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genotype_test_data.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F100762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = getting_started1.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F110762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = getting_started2.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F120762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_4stack.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F130762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_4stack_thread.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F140762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_base.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F150762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = "hardware_cpu-fixups.cc";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F160762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = "hardware_cpu-fixups.hh";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F170762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_cpu.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F180762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_cpu_thread.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F190762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_factory.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = hardware_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = help_alias.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = help_entry.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = help_full_entry.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = help_manager.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F1F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = help_type.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F200762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = histogram.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F210762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = indexed_block_struct.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F220762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = init_file.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F230762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genebank.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F240762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genotype.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F250762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genotype_birth_data.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F260762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genotype_control.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F270762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genotype_element.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F280762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inject_genotype_queue.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F290762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_lib_base.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_lib_cpu.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = instruction.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = int_sum.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F2F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = integrated_schedule.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F300762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = integrated_schedule_node.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F310762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = kaben_brainstorms.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F320762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = kaben_brainstorms.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F330762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = kaben_brainstorms.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F340762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = landscape.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F350762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = lineage.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F360762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = lineage_control.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F370762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = local_mutations.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F380762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = memory_flags.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F390762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = merit.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = mutation.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = mutation_lib.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = mutation_rates.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = mx_code_array.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = my_code_array_less_than.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F3F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = org_message.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F400762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F410762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = phenotype.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F430762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = population.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F440762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = population_cell.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F450762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = population_event.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F460762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = population_event_factory.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F470762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = "population_interface-fixups.hh";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F480762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = population_interface.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F490762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = prob_schedule.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = "py_avida_driver-fixups.cc";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = py_avida_driver.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = py_avida_driver.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_doctest_driver.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_kaben_brainstorms_t.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F4F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = py_unittest_driver.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F500762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = random.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F510762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = reaction.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F520762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = reaction_lib.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F530762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = reaction_process.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F540762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = reaction_requisite.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F550762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = reaction_result.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F560762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = ref_block.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F570762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = resource.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F580762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = resource_count.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F590762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = resource_lib.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = running_average.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = scaled_block.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = schedule.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = spatial_count_elem.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = spatial_res_count.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F5F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = species.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F600762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = species_control.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F610762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = species_queue.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F620762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = stats.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F630762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = string.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F640762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = string_iterator.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F650762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = string_list.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F660762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = string_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F670762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tArray.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F680762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tArray_instantiations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F690762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = task_entry.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = task_lib.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tBuffer.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6C0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tBuffer_instantiations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6D0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tDictionary.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6E0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDictionary_instantiations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F6F0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = test_cpu.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F700762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = test_getting_started1.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F710762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = test_getting_started2.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F720762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = test_util.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F730762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tList.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F740762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tList_instantiations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F750762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tMatrix.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F760762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tMatrix_instantiations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F770762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tools.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F780762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = uint.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F790762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = weighted_index.pyste;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F7A0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F7B0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30F7C0762539D008F7A48 = {
+		DCC30F7C0762539D008F7A48 /* cpu */ = {
+			isa = PBXGroup;
 			children = (
-				DCC30FA90762539D008F7A48,
-				DCC30FAA0762539D008F7A48,
-				DCC30FAB0762539D008F7A48,
-				DCC30FAC0762539D008F7A48,
-				DCC30FAD0762539D008F7A48,
-				DCC30FB00762539D008F7A48,
-				DCC30FB10762539D008F7A48,
-				DCC30FB20762539D008F7A48,
-				DCC30FB30762539D008F7A48,
-				DCC30FB40762539D008F7A48,
-				DCC30FB50762539D008F7A48,
-				DCC30FB60762539D008F7A48,
-				DCC30FB70762539D008F7A48,
-				DCC30FB80762539D008F7A48,
-				DCC30FB90762539D008F7A48,
-				DCC30FBA0762539D008F7A48,
-				DCC30FBB0762539D008F7A48,
-				DCC30FBC0762539D008F7A48,
-				DCC30FBD0762539D008F7A48,
-				DCC30FBE0762539D008F7A48,
-				DCC30FBF0762539D008F7A48,
-				DCC30FC00762539D008F7A48,
-				DCC30FC10762539D008F7A48,
-				DCC30FC20762539D008F7A48,
-				DCC30FC30762539D008F7A48,
-				706D30FB0852363400D7DC8F,
-				706D30FC0852363400D7DC8F,
-				706D3170085248F800D7DC8F,
-				706D30FF0852366400D7DC8F,
-				706D31000852366400D7DC8F,
-				70CBFCE80815E7FE0078D8CC,
-				70CBFCE90815E7FE0078D8CC,
-				70CBFCEA0815E7FE0078D8CC,
-				70CBFCEB0815E7FE0078D8CC,
-				70CBFCEC0815E7FE0078D8CC,
-				70CBFCED0815E7FE0078D8CC,
-				DCC30FC40762539D008F7A48,
-				DCC30FC50762539D008F7A48,
-				706D3155085243CD00D7DC8F,
-				706D3156085243CD00D7DC8F,
-				DCC30FA70762539D008F7A48,
-				DCC30FA80762539D008F7A48,
-				DCC30FC60762539D008F7A48,
-				DCC30FC80762539D008F7A48,
-				DCC30FC90762539D008F7A48,
-				DCC30FCA0762539D008F7A48,
-				DCC30FCB0762539D008F7A48,
-				DCC30FCC0762539D008F7A48,
-				DCC30FCD0762539D008F7A48,
-				706D30CC0852328F00D7DC8F,
+				DCC30FA90762539D008F7A48 /* CMakeLists.txt */,
+				DCC30FAA0762539D008F7A48 /* code_label.cc */,
+				DCC30FAB0762539D008F7A48 /* code_label.hh */,
+				DCC30FAC0762539D008F7A48 /* cpu.pri */,
+				DCC30FAD0762539D008F7A48 /* cpu_defs.hh */,
+				DCC30FB00762539D008F7A48 /* cpu_memory.cc */,
+				DCC30FB10762539D008F7A48 /* cpu_memory.hh */,
+				DCC30FB20762539D008F7A48 /* cpu_stack.cc */,
+				DCC30FB30762539D008F7A48 /* cpu_stack.hh */,
+				DCC30FB40762539D008F7A48 /* cpu_stats.hh */,
+				DCC30FB50762539D008F7A48 /* cpu_test_info.cc */,
+				DCC30FB60762539D008F7A48 /* cpu_test_info.hh */,
+				DCC30FB70762539D008F7A48 /* hardware_4stack.cc */,
+				DCC30FB80762539D008F7A48 /* hardware_4stack.hh */,
+				DCC30FB90762539D008F7A48 /* hardware_4stack_constants.hh */,
+				DCC30FBA0762539D008F7A48 /* hardware_4stack_thread.cc */,
+				DCC30FBB0762539D008F7A48 /* hardware_4stack_thread.hh */,
+				DCC30FBC0762539D008F7A48 /* hardware_base.cc */,
+				DCC30FBD0762539D008F7A48 /* hardware_base.hh */,
+				DCC30FBE0762539D008F7A48 /* hardware_cpu.cc */,
+				DCC30FBF0762539D008F7A48 /* hardware_cpu.hh */,
+				DCC30FC00762539D008F7A48 /* hardware_cpu_thread.cc */,
+				DCC30FC10762539D008F7A48 /* hardware_cpu_thread.hh */,
+				DCC30FC20762539D008F7A48 /* hardware_factory.cc */,
+				DCC30FC30762539D008F7A48 /* hardware_factory.hh */,
+				706D30FB0852363400D7DC8F /* hardware_smt.h */,
+				706D30FC0852363400D7DC8F /* hardware_smt.cc */,
+				706D3170085248F800D7DC8F /* hardware_smt_constants.h */,
+				706D30FF0852366400D7DC8F /* hardware_smt_thread.h */,
+				706D31000852366400D7DC8F /* hardware_smt_thread.cc */,
+				70CBFCE80815E7FE0078D8CC /* hardware_status_printer.cc */,
+				70CBFCE90815E7FE0078D8CC /* hardware_status_printer.hh */,
+				70CBFCEA0815E7FE0078D8CC /* hardware_tracer_4stack.hh */,
+				70CBFCEB0815E7FE0078D8CC /* hardware_tracer_cpu.hh */,
+				70CBFCEC0815E7FE0078D8CC /* hardware_tracer_test_cpu.hh */,
+				70CBFCED0815E7FE0078D8CC /* hardware_tracer.hh */,
+				DCC30FC40762539D008F7A48 /* hardware_util.cc */,
+				DCC30FC50762539D008F7A48 /* hardware_util.hh */,
+				706D3155085243CD00D7DC8F /* head_cpu.cc */,
+				706D3156085243CD00D7DC8F /* head_cpu.hh */,
+				DCC30FA70762539D008F7A48 /* head_multi_mem.cc */,
+				DCC30FA80762539D008F7A48 /* head_multi_mem.hh */,
+				DCC30FC60762539D008F7A48 /* inst_lib_cpu.hh */,
+				DCC30FC80762539D008F7A48 /* memory_flags.cc */,
+				DCC30FC90762539D008F7A48 /* memory_flags.hh */,
+				DCC30FCA0762539D008F7A48 /* test_cpu.cc */,
+				DCC30FCB0762539D008F7A48 /* test_cpu.hh */,
+				DCC30FCC0762539D008F7A48 /* test_util.cc */,
+				DCC30FCD0762539D008F7A48 /* test_util.hh */,
+				706D30CC0852328F00D7DC8F /* tInstLib.h */,
 			);
-			isa = PBXGroup;
 			path = cpu;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30FA70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = head_multi_mem.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FA80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = head_multi_mem.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FA90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FAA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = code_label.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FAB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = code_label.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FAC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cpu.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FAD0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cpu_defs.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB00762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_memory.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB10762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cpu_memory.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB20762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_stack.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB30762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cpu_stack.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB40762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cpu_stats.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB50762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_test_info.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB60762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cpu_test_info.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_4stack.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_4stack.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FB90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_4stack_constants.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_4stack_thread.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_4stack_thread.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_base.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBD0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_base.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_cpu.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FBF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC00762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_cpu_thread.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC10762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_cpu_thread.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC20762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_factory.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC30762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_factory.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC40762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC50762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hardware_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC60762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inst_lib_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = memory_flags.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FC90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = memory_flags.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_cpu.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = test_cpu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCD0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = test_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = defs.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FCF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = Doxyfile;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FD00762539D008F7A48 = {
+		DCC30FD00762539D008F7A48 /* event */ = {
+			isa = PBXGroup;
 			children = (
-				DCC30FEB0762539D008F7A48,
-				DCC30FEC0762539D008F7A48,
-				DCC30FED0762539D008F7A48,
-				DCC30FEE0762539D008F7A48,
-				DCC30FEF0762539D008F7A48,
-				DCC30FF00762539D008F7A48,
-				DCC30FF10762539D008F7A48,
-				DCC30FF20762539D008F7A48,
-				DCC30FF30762539D008F7A48,
-				DCC30FF40762539D008F7A48,
-				DCC30FF50762539D008F7A48,
-				DCC30FF60762539D008F7A48,
-				DCC30FF70762539D008F7A48,
-				DCC30FF80762539D008F7A48,
-				DCC30FF90762539D008F7A48,
-				DCC30FFA0762539D008F7A48,
-				DCC30FFB0762539D008F7A48,
-				DCC30FFC0762539D008F7A48,
-				DCC30FFD0762539D008F7A48,
-				DCC30FFF0762539D008F7A48,
-				DCC310000762539D008F7A48,
-				DCC310010762539D008F7A48,
-				DCC310020762539D008F7A48,
+				DCC30FEB0762539D008F7A48 /* CMakeLists.txt */,
+				DCC30FEC0762539D008F7A48 /* cPopulation.events */,
+				DCC30FED0762539D008F7A48 /* cPopulation_event_list */,
+				DCC30FEE0762539D008F7A48 /* event.cc */,
+				DCC30FEF0762539D008F7A48 /* event.hh */,
+				DCC30FF00762539D008F7A48 /* event.pri */,
+				DCC30FF10762539D008F7A48 /* event_factory.cc */,
+				DCC30FF20762539D008F7A48 /* event_factory.hh */,
+				DCC30FF30762539D008F7A48 /* event_factory_manager.cc */,
+				DCC30FF40762539D008F7A48 /* event_factory_manager.hh */,
+				DCC30FF50762539D008F7A48 /* event_list.cc */,
+				DCC30FF60762539D008F7A48 /* event_list.hh */,
+				DCC30FF70762539D008F7A48 /* event_list_entry.cc */,
+				DCC30FF80762539D008F7A48 /* event_list_entry.hh */,
+				DCC30FF90762539D008F7A48 /* event_list_iterator.cc */,
+				DCC30FFA0762539D008F7A48 /* event_list_iterator.hh */,
+				DCC30FFB0762539D008F7A48 /* event_triggers.cc */,
+				DCC30FFC0762539D008F7A48 /* event_triggers.hh */,
+				DCC30FFD0762539D008F7A48 /* make_events.pl */,
+				DCC310000762539D008F7A48 /* population_event.hh */,
+				DCC310010762539D008F7A48 /* population_event_factory.cc */,
+				DCC310020762539D008F7A48 /* population_event_factory.hh */,
 			);
-			isa = PBXGroup;
 			path = event;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC30FEB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FEC0762539D008F7A48 = {
-			explicitFileType = text.script;
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			path = cPopulation.events;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FED0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = cPopulation_event_list;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FEE0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FEF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF00762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = event.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF10762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_factory.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF20762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_factory.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF30762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_factory_manager.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF40762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_factory_manager.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF50762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF60762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_list.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF70762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list_entry.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF80762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_list_entry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FF90762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list_iterator.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FFA0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_list_iterator.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FFB0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_triggers.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FFC0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = event_triggers.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FFD0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.perl;
-			path = make_events.pl;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC30FFF0762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_event.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310000762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = population_event.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310010762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_event_factory.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310020762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = population_event_factory.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310030762539D008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = LEVELS;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310040762539D008F7A48 = {
+		DCC310040762539D008F7A48 /* main */ = {
+			isa = PBXGroup;
 			children = (
-				DCC310900762539E008F7A48,
-				DCC310910762539E008F7A48,
-				DCC310920762539E008F7A48,
-				DCC310930762539E008F7A48,
-				DCC310940762539E008F7A48,
-				DCC310950762539E008F7A48,
-				DCC310960762539E008F7A48,
-				DCC310970762539E008F7A48,
-				DCC310980762539E008F7A48,
-				DCC310990762539E008F7A48,
-				DCC3109A0762539E008F7A48,
-				DCC3109B0762539E008F7A48,
-				DCC3109C0762539E008F7A48,
-				DCC3109D0762539E008F7A48,
-				DCC3109E0762539E008F7A48,
-				DCC3109F0762539E008F7A48,
-				DCC310A00762539E008F7A48,
-				DCC310A10762539E008F7A48,
-				DCC310A20762539E008F7A48,
-				DCC310A30762539E008F7A48,
-				DCC310A40762539E008F7A48,
-				DCC310A50762539E008F7A48,
-				DCC310A60762539E008F7A48,
-				DCC310A70762539E008F7A48,
-				DCC310A80762539E008F7A48,
-				DCC310A90762539E008F7A48,
-				DCC310AA0762539E008F7A48,
-				DCC310AB0762539E008F7A48,
-				DCC310AC0762539E008F7A48,
-				DCC310AD0762539E008F7A48,
-				DCC310AE0762539E008F7A48,
-				DCC310AF0762539E008F7A48,
-				DCC310B00762539E008F7A48,
-				DCC310C50762539E008F7A48,
-				DCC310C60762539E008F7A48,
-				DCC310C70762539E008F7A48,
-				DCC310C80762539E008F7A48,
-				DCC310C90762539E008F7A48,
-				DCC310CA0762539E008F7A48,
-				DCC310CB0762539E008F7A48,
-				DCC310CC0762539E008F7A48,
-				DCC310CD0762539E008F7A48,
-				DCC310CE0762539E008F7A48,
-				DCC310CF0762539E008F7A48,
-				DCC310D00762539E008F7A48,
-				DCC310D10762539E008F7A48,
-				DCC310D20762539E008F7A48,
-				DCC310D30762539E008F7A48,
-				DCC310D40762539E008F7A48,
-				DCC310D50762539E008F7A48,
-				DCC310D60762539E008F7A48,
-				DCC310D70762539E008F7A48,
-				DCC310D80762539E008F7A48,
-				DCC310D90762539E008F7A48,
-				DCC310DA0762539E008F7A48,
-				DCC310DB0762539E008F7A48,
-				DCC310DC0762539E008F7A48,
-				DCC310DD0762539E008F7A48,
-				DCC310DE0762539E008F7A48,
-				DCC310DF0762539E008F7A48,
-				DCC310E00762539E008F7A48,
-				DCC310E10762539E008F7A48,
-				DCC310E20762539E008F7A48,
-				DCC310E30762539E008F7A48,
-				DCC310E40762539E008F7A48,
-				DCC310E50762539E008F7A48,
-				DCC310E60762539E008F7A48,
-				DCC310E70762539E008F7A48,
-				DCC310E80762539E008F7A48,
-				DCC310E90762539E008F7A48,
-				DCC310EA0762539E008F7A48,
-				DCC310EB0762539E008F7A48,
-				DCC310EC0762539E008F7A48,
-				DCC310ED0762539E008F7A48,
-				DCC310EE0762539E008F7A48,
-				DCC310EF0762539E008F7A48,
-				DCC310F00762539E008F7A48,
-				DCC310F10762539E008F7A48,
-				DCC310F30762539E008F7A48,
-				DCC310F40762539E008F7A48,
-				DCC310F50762539E008F7A48,
-				DCC310F60762539E008F7A48,
-				DCC310F70762539E008F7A48,
-				DCC310F80762539E008F7A48,
-				DCC310F90762539E008F7A48,
-				DCC310FA0762539E008F7A48,
-				DCC310FB0762539E008F7A48,
-				DCC310FC0762539E008F7A48,
-				DCC310FD0762539E008F7A48,
-				DCC310FE0762539E008F7A48,
-				DCC310FF0762539E008F7A48,
-				DCC311000762539E008F7A48,
-				DCC311010762539E008F7A48,
-				DCC311020762539E008F7A48,
-				DCC311030762539E008F7A48,
-				DCC311040762539E008F7A48,
-				DCC311050762539E008F7A48,
-				DCC311060762539E008F7A48,
-				DCC311070762539E008F7A48,
-				DCC311080762539E008F7A48,
-				DCC311090762539E008F7A48,
-				DCC3110A0762539E008F7A48,
-				DCC3110B0762539E008F7A48,
-				DCC3110C0762539E008F7A48,
-				DCC3110D0762539E008F7A48,
-				DCC3110E0762539E008F7A48,
-				DCC3110F0762539E008F7A48,
-				DCC311100762539E008F7A48,
-				DCC311110762539E008F7A48,
-				DCC311120762539E008F7A48,
-				DCC311130762539E008F7A48,
-				DCC311140762539E008F7A48,
-				DCC311150762539E008F7A48,
-				DCC311160762539E008F7A48,
-				DCC311170762539E008F7A48,
-				DCC311180762539E008F7A48,
-				DCC311190762539E008F7A48,
-				DCC3111A0762539E008F7A48,
-				DCC3111B0762539E008F7A48,
-				DCC3111C0762539E008F7A48,
-				DCC3111D0762539E008F7A48,
-				DCC3111E0762539E008F7A48,
-				DCC3111F0762539E008F7A48,
-				DCC311200762539E008F7A48,
-				DCC311210762539E008F7A48,
-				DCC311220762539E008F7A48,
-				DCC311230762539E008F7A48,
-				DCC311240762539E008F7A48,
-				DCC311250762539E008F7A48,
-				DCC311260762539E008F7A48,
-				DCC311270762539E008F7A48,
-				DCC311280762539E008F7A48,
-				DCC311290762539E008F7A48,
-				DCC3112A0762539E008F7A48,
-				DCC3112B0762539E008F7A48,
-				DCC3112C0762539E008F7A48,
-				DCC3112D0762539E008F7A48,
-				DCC3112E0762539E008F7A48,
+				DCC310900762539E008F7A48 /* analyze.cc */,
+				DCC310910762539E008F7A48 /* analyze.hh */,
+				DCC310920762539E008F7A48 /* analyze_command.hh */,
+				DCC310930762539E008F7A48 /* analyze_command_def.hh */,
+				DCC310940762539E008F7A48 /* analyze_command_def_base.hh */,
+				DCC310950762539E008F7A48 /* analyze_flow_command.hh */,
+				DCC310960762539E008F7A48 /* analyze_flow_command_def.hh */,
+				DCC310970762539E008F7A48 /* analyze_function.hh */,
+				DCC310980762539E008F7A48 /* analyze_genotype.cc */,
+				DCC310990762539E008F7A48 /* analyze_genotype.hh */,
+				DCC3109A0762539E008F7A48 /* analyze_util.cc */,
+				DCC3109B0762539E008F7A48 /* analyze_util.hh */,
+				DCC3109C0762539E008F7A48 /* avida.cc */,
+				DCC3109D0762539E008F7A48 /* avida.hh */,
+				DCC3109E0762539E008F7A48 /* avida_driver_analyze.cc */,
+				DCC3109F0762539E008F7A48 /* avida_driver_analyze.hh */,
+				DCC310A00762539E008F7A48 /* avida_driver_base.cc */,
+				DCC310A10762539E008F7A48 /* avida_driver_base.hh */,
+				DCC310A20762539E008F7A48 /* avida_driver_population.cc */,
+				DCC310A30762539E008F7A48 /* avida_driver_population.hh */,
+				DCC310A40762539E008F7A48 /* avida_triggers.hh */,
+				DCC310A50762539E008F7A48 /* birth_chamber.cc */,
+				DCC310A60762539E008F7A48 /* birth_chamber.hh */,
+				DCC310A70762539E008F7A48 /* callback_util.cc */,
+				DCC310A80762539E008F7A48 /* callback_util.hh */,
+				DCC310A90762539E008F7A48 /* CMakeLists.txt */,
+				DCC310AA0762539E008F7A48 /* config.cc */,
+				DCC310AB0762539E008F7A48 /* config.hh */,
+				DCC310AC0762539E008F7A48 /* environment.cc */,
+				DCC310AD0762539E008F7A48 /* environment.hh */,
+				DCC310AE0762539E008F7A48 /* fitness_matrix.cc */,
+				DCC310AF0762539E008F7A48 /* fitness_matrix.hh */,
+				DCC310B00762539E008F7A48 /* functional_testsuites */,
+				DCC310C50762539E008F7A48 /* genebank.cc */,
+				DCC310C60762539E008F7A48 /* genebank.hh */,
+				DCC310C70762539E008F7A48 /* genome.cc */,
+				DCC310C80762539E008F7A48 /* genome.hh */,
+				DCC310C90762539E008F7A48 /* genome_util.cc */,
+				DCC310CA0762539E008F7A48 /* genome_util.hh */,
+				DCC310CB0762539E008F7A48 /* genotype.cc */,
+				DCC310CC0762539E008F7A48 /* genotype.hh */,
+				DCC310CD0762539E008F7A48 /* genotype_batch.hh */,
+				DCC310CE0762539E008F7A48 /* genotype_birth_data.cc */,
+				DCC310CF0762539E008F7A48 /* genotype_birth_data.hh */,
+				DCC310D00762539E008F7A48 /* genotype_control.cc */,
+				DCC310D10762539E008F7A48 /* genotype_control.hh */,
+				DCC310D20762539E008F7A48 /* genotype_macros.hh */,
+				DCC310D30762539E008F7A48 /* genotype_test_data.cc */,
+				DCC310D40762539E008F7A48 /* genotype_test_data.hh */,
+				DCC310D50762539E008F7A48 /* inject_genebank.cc */,
+				DCC310D60762539E008F7A48 /* inject_genebank.hh */,
+				DCC310D70762539E008F7A48 /* inject_genebank_macros.hh */,
+				DCC310D80762539E008F7A48 /* inject_genotype.cc */,
+				DCC310D90762539E008F7A48 /* inject_genotype.hh */,
+				DCC310DA0762539E008F7A48 /* inject_genotype_birth_data.cc */,
+				DCC310DB0762539E008F7A48 /* inject_genotype_birth_data.hh */,
+				DCC310DC0762539E008F7A48 /* inject_genotype_control.cc */,
+				DCC310DD0762539E008F7A48 /* inject_genotype_control.hh */,
+				DCC310DE0762539E008F7A48 /* inject_genotype_element.hh */,
+				DCC310DF0762539E008F7A48 /* inject_genotype_queue.cc */,
+				DCC310E00762539E008F7A48 /* inject_genotype_queue.hh */,
+				DCC310E10762539E008F7A48 /* inst_lib_base.hh */,
+				DCC310E20762539E008F7A48 /* inst_set.cc */,
+				DCC310E30762539E008F7A48 /* inst_set.hh */,
+				DCC310E40762539E008F7A48 /* inst_util.cc */,
+				DCC310E50762539E008F7A48 /* inst_util.hh */,
+				DCC310E60762539E008F7A48 /* instruction.cc */,
+				DCC310E70762539E008F7A48 /* instruction.hh */,
+				DCC310E80762539E008F7A48 /* landscape.cc */,
+				DCC310E90762539E008F7A48 /* landscape.hh */,
+				DCC310EA0762539E008F7A48 /* lineage.cc */,
+				DCC310EB0762539E008F7A48 /* lineage.hh */,
+				DCC310EC0762539E008F7A48 /* lineage_control.cc */,
+				DCC310ED0762539E008F7A48 /* lineage_control.hh */,
+				DCC310EE0762539E008F7A48 /* local_mutations.cc */,
+				DCC310EF0762539E008F7A48 /* local_mutations.hh */,
+				DCC310F00762539E008F7A48 /* main.pro */,
+				DCC310F10762539E008F7A48 /* main_sub.pri */,
+				DCC310F30762539E008F7A48 /* mutation.cc */,
+				DCC310F40762539E008F7A48 /* mutation.hh */,
+				DCC310F50762539E008F7A48 /* mutation_lib.cc */,
+				DCC310F60762539E008F7A48 /* mutation_lib.hh */,
+				DCC310F70762539E008F7A48 /* mutation_macros.hh */,
+				DCC310F80762539E008F7A48 /* mutation_rates.cc */,
+				DCC310F90762539E008F7A48 /* mutation_rates.hh */,
+				DCC310FA0762539E008F7A48 /* mx_code_array.cc */,
+				DCC310FB0762539E008F7A48 /* mx_code_array.hh */,
+				DCC310FC0762539E008F7A48 /* my_code_array_less_than.hh */,
+				DCC310FD0762539E008F7A48 /* org_message.cc */,
+				DCC310FE0762539E008F7A48 /* org_message.hh */,
+				DCC310FF0762539E008F7A48 /* organism.cc */,
+				DCC311000762539E008F7A48 /* organism.hh */,
+				DCC311010762539E008F7A48 /* phenotype.cc */,
+				DCC311020762539E008F7A48 /* phenotype.hh */,
+				DCC311030762539E008F7A48 /* population.cc */,
+				DCC311040762539E008F7A48 /* population.hh */,
+				DCC311050762539E008F7A48 /* population_cell.cc */,
+				DCC311060762539E008F7A48 /* population_cell.hh */,
+				DCC311070762539E008F7A48 /* population_interface.cc */,
+				DCC311080762539E008F7A48 /* population_interface.hh */,
+				DCC311090762539E008F7A48 /* primitive.cc */,
+				DCC3110A0762539E008F7A48 /* primitive.hh */,
+				DCC3110B0762539E008F7A48 /* reaction.cc */,
+				DCC3110C0762539E008F7A48 /* reaction.hh */,
+				DCC3110D0762539E008F7A48 /* reaction_lib.cc */,
+				DCC3110E0762539E008F7A48 /* reaction_lib.hh */,
+				DCC3110F0762539E008F7A48 /* reaction_macros.hh */,
+				DCC311100762539E008F7A48 /* reaction_process.cc */,
+				DCC311110762539E008F7A48 /* reaction_process.hh */,
+				DCC311120762539E008F7A48 /* reaction_requisite.cc */,
+				DCC311130762539E008F7A48 /* reaction_requisite.hh */,
+				DCC311140762539E008F7A48 /* reaction_result.cc */,
+				DCC311150762539E008F7A48 /* reaction_result.hh */,
+				DCC311160762539E008F7A48 /* resource.cc */,
+				DCC311170762539E008F7A48 /* resource.hh */,
+				DCC311180762539E008F7A48 /* resource_count.cc */,
+				DCC311190762539E008F7A48 /* resource_count.hh */,
+				DCC3111A0762539E008F7A48 /* resource_count_macros.hh */,
+				DCC3111B0762539E008F7A48 /* resource_lib.cc */,
+				DCC3111C0762539E008F7A48 /* resource_lib.hh */,
+				DCC3111D0762539E008F7A48 /* resource_macros.hh */,
+				DCC3111E0762539E008F7A48 /* spatial_count_elem.cc */,
+				DCC3111F0762539E008F7A48 /* spatial_count_elem.hh */,
+				DCC311200762539E008F7A48 /* spatial_res_count.cc */,
+				DCC311210762539E008F7A48 /* spatial_res_count.hh */,
+				DCC311220762539E008F7A48 /* species.cc */,
+				DCC311230762539E008F7A48 /* species.hh */,
+				DCC311240762539E008F7A48 /* species_control.cc */,
+				DCC311250762539E008F7A48 /* species_control.hh */,
+				DCC311260762539E008F7A48 /* species_queue.cc */,
+				DCC311270762539E008F7A48 /* species_queue.hh */,
+				DCC311280762539E008F7A48 /* stats.cc */,
+				DCC311290762539E008F7A48 /* stats.hh */,
+				DCC3112A0762539E008F7A48 /* task_entry.cc */,
+				DCC3112B0762539E008F7A48 /* task_entry.hh */,
+				DCC3112C0762539E008F7A48 /* task_lib.cc */,
+				DCC3112D0762539E008F7A48 /* task_lib.hh */,
+				DCC3112E0762539E008F7A48 /* unit_testsuites */,
 			);
-			isa = PBXGroup;
 			path = main;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310900762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310910762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310920762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_command.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310930762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_command_def.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310940762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_command_def_base.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310950762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_flow_command.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310960762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_flow_command_def.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310970762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_function.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310980762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_genotype.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310990762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_genotype.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109A0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = analyze_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109D0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = avida.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109E0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_analyze.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3109F0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = avida_driver_analyze.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A00762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_base.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A10762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = avida_driver_base.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A20762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_population.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A30762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = avida_driver_population.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A40762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = avida_triggers.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A50762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = birth_chamber.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A60762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = birth_chamber.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A70762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = callback_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A80762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = callback_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310A90762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AA0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = config.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AB0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = config.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AC0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = environment.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AD0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = environment.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AE0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = fitness_matrix.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310AF0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = fitness_matrix.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310B00762539E008F7A48 = {
+		DCC310B00762539E008F7A48 /* functional_testsuites */ = {
+			isa = PBXGroup;
 			children = (
-				DCC310B30762539E008F7A48,
-				DCC310B60762539E008F7A48,
-				DCC310B90762539E008F7A48,
-				DCC310BC0762539E008F7A48,
-				DCC310BF0762539E008F7A48,
-				DCC310C20762539E008F7A48,
+				DCC310B30762539E008F7A48 /* config */,
+				DCC310B60762539E008F7A48 /* default.md5sum */,
+				DCC310B90762539E008F7A48 /* default.tail */,
+				DCC310BC0762539E008F7A48 /* demo.md5sum */,
+				DCC310BF0762539E008F7A48 /* demo.tail */,
+				DCC310C20762539E008F7A48 /* tedious.tail */,
 			);
-			isa = PBXGroup;
 			path = functional_testsuites;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310B30762539E008F7A48 = {
+		DCC310B30762539E008F7A48 /* config */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = config;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310B60762539E008F7A48 = {
+		DCC310B60762539E008F7A48 /* default.md5sum */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = default.md5sum;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310B90762539E008F7A48 = {
+		DCC310B90762539E008F7A48 /* default.tail */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = default.tail;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310BC0762539E008F7A48 = {
+		DCC310BC0762539E008F7A48 /* demo.md5sum */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = demo.md5sum;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310BF0762539E008F7A48 = {
+		DCC310BF0762539E008F7A48 /* demo.tail */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = demo.tail;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310C20762539E008F7A48 = {
+		DCC310C20762539E008F7A48 /* tedious.tail */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = tedious.tail;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC310C50762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genebank.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310C60762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genebank.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310C70762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genome.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310C80762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genome.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310C90762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genome_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CA0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genome_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CB0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CC0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CD0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype_batch.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CE0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_birth_data.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310CF0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype_birth_data.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D00762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_control.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D10762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype_control.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D20762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D30762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_test_data.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D40762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genotype_test_data.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D50762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genebank.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D60762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genebank.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D70762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genebank_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D80762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310D90762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genotype.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DA0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_birth_data.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DB0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genotype_birth_data.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DC0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_control.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DD0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genotype_control.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DE0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genotype_element.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310DF0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_queue.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E00762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inject_genotype_queue.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E10762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inst_lib_base.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E20762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inst_set.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E30762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inst_set.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E40762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inst_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E50762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = inst_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E60762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = instruction.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E70762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = instruction.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E80762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = landscape.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310E90762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = landscape.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310EA0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = lineage.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310EB0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = lineage.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310EC0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = lineage_control.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310ED0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = lineage_control.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310EE0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = local_mutations.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310EF0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = local_mutations.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F00762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = main.pro;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F10762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = main_sub.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F30762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F40762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = mutation.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F50762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation_lib.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F60762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = mutation_lib.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F70762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = mutation_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F80762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation_rates.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310F90762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = mutation_rates.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FA0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mx_code_array.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FB0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = mx_code_array.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FC0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = my_code_array_less_than.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FD0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = org_message.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FE0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = org_message.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC310FF0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = organism.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311000762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = organism.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311010762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = phenotype.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311020762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = phenotype.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311030762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311040762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = population.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311050762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_cell.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311060762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = population_cell.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311070762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_interface.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311080762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = population_interface.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311090762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = primitive.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110A0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = primitive.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110D0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_lib.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110E0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction_lib.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3110F0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311100762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_process.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311110762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction_process.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311120762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_requisite.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311130762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction_requisite.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311140762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_result.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311150762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = reaction_result.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311160762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311170762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = resource.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311180762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource_count.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311190762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = resource_count.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111A0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = resource_count_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource_lib.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = resource_lib.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111D0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = resource_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111E0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = spatial_count_elem.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3111F0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = spatial_count_elem.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311200762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = spatial_res_count.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311210762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = spatial_res_count.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311220762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311230762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = species.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311240762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species_control.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311250762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = species_control.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311260762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species_queue.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311270762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = species_queue.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311280762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = stats.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311290762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = stats.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3112A0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_entry.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3112B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = task_entry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3112C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_lib.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3112D0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = task_lib.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3112E0762539E008F7A48 = {
+		DCC3112E0762539E008F7A48 /* unit_testsuites */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311310762539E008F7A48,
-				DCC311340762539E008F7A48,
+				DCC311310762539E008F7A48 /* config */,
+				DCC311340762539E008F7A48 /* demo.hello */,
 			);
-			isa = PBXGroup;
 			path = unit_testsuites;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311310762539E008F7A48 = {
+		DCC311310762539E008F7A48 /* config */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = config;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311340762539E008F7A48 = {
+		DCC311340762539E008F7A48 /* demo.hello */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = demo.hello;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311380762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = MAP.renamed_to_avoid_naming_conflict_with_stl;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311390762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = modules.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3113A0762539E008F7A48 = {
+		DCC3113A0762539E008F7A48 /* support */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3114B0762539E008F7A48,
-				DCC3114C0762539E008F7A48,
-				DCC3114D0762539E008F7A48,
-				DCC311800762539F008F7A48,
-				DCC311810762539F008F7A48,
-				DCC311820762539F008F7A48,
-				DCC311830762539F008F7A48,
-				706D33100854A7D700D7DC8F,
-				DCC311840762539F008F7A48,
-				DCC311850762539F008F7A48,
-				DCC311860762539F008F7A48,
-				706D33270854A90D00D7DC8F,
-				DCC311870762539F008F7A48,
-				DCC311890762539F008F7A48,
-				DCC3118A0762539F008F7A48,
-				DCC3118B0762539F008F7A48,
-				706D330E0854A7B900D7DC8F,
-				DCC3118C0762539F008F7A48,
+				DCC3114B0762539E008F7A48 /* analyze.cfg */,
+				DCC3114C0762539E008F7A48 /* CMakeLists.txt */,
+				DCC3114D0762539E008F7A48 /* config */,
+				DCC311800762539F008F7A48 /* environment.cfg */,
+				DCC311810762539F008F7A48 /* events.cfg */,
+				DCC311820762539F008F7A48 /* genesis */,
+				DCC311830762539F008F7A48 /* genesis.4stack */,
+				706D33100854A7D700D7DC8F /* genesis.smt */,
+				DCC311840762539F008F7A48 /* inst_set.4stack */,
+				DCC311850762539F008F7A48 /* inst_set.default */,
+				DCC311860762539F008F7A48 /* inst_set.sex */,
+				706D33270854A90D00D7DC8F /* inst_set.smt */,
+				DCC311870762539F008F7A48 /* inst_set.tmp */,
+				DCC311890762539F008F7A48 /* organism.default */,
+				DCC3118A0762539F008F7A48 /* organism.heads.100 */,
+				DCC3118B0762539F008F7A48 /* organism.sex */,
+				706D330E0854A7B900D7DC8F /* organism.smt */,
+				DCC3118C0762539F008F7A48 /* preset_organisms */,
 			);
-			isa = PBXGroup;
 			path = support;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3114B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3114C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3114D0762539E008F7A48 = {
+		DCC3114D0762539E008F7A48 /* config */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311680762539E008F7A48,
-				DCC311690762539E008F7A48,
-				DCC3116A0762539E008F7A48,
-				DCC3116B0762539E008F7A48,
-				DCC3116C0762539E008F7A48,
-				DCC3116D0762539E008F7A48,
-				DCC3116E0762539E008F7A48,
-				DCC3116F0762539E008F7A48,
-				DCC311700762539E008F7A48,
-				DCC311710762539E008F7A48,
-				DCC311720762539E008F7A48,
-				DCC311730762539E008F7A48,
-				DCC311740762539E008F7A48,
-				DCC311750762539E008F7A48,
-				DCC311760762539F008F7A48,
-				DCC311770762539F008F7A48,
-				DCC311780762539F008F7A48,
-				DCC311790762539F008F7A48,
-				DCC3117A0762539F008F7A48,
-				DCC3117B0762539F008F7A48,
-				DCC3117C0762539F008F7A48,
-				DCC3117D0762539F008F7A48,
-				DCC3117E0762539F008F7A48,
-				DCC3117F0762539F008F7A48,
+				DCC311680762539E008F7A48 /* environment.2paths */,
+				DCC311690762539E008F7A48 /* environment.9resource */,
+				DCC3116A0762539E008F7A48 /* environment.all_logic */,
+				DCC3116B0762539E008F7A48 /* environment.cascade */,
+				DCC3116C0762539E008F7A48 /* inst_set.19.short */,
+				DCC3116D0762539E008F7A48 /* inst_set.24.old */,
+				DCC3116E0762539E008F7A48 /* inst_set.26.default */,
+				DCC3116F0762539E008F7A48 /* inst_set.27.multi */,
+				DCC311700762539E008F7A48 /* inst_set.27.no-nop */,
+				DCC311710762539E008F7A48 /* inst_set.27.parasite */,
+				DCC311720762539E008F7A48 /* inst_set.28.base */,
+				DCC311730762539E008F7A48 /* inst_set.28.const */,
+				DCC311740762539E008F7A48 /* inst_set.29.base_memsize */,
+				DCC311750762539E008F7A48 /* inst_set.31.multi */,
+				DCC311760762539F008F7A48 /* inst_set.32.heads */,
+				DCC311770762539F008F7A48 /* inst_set.heads.parasite */,
+				DCC311780762539F008F7A48 /* organism.heads.100 */,
+				DCC311790762539F008F7A48 /* organism.heads.15 */,
+				DCC3117A0762539F008F7A48 /* organism.heads.50 */,
+				DCC3117B0762539F008F7A48 /* organism.host */,
+				DCC3117C0762539F008F7A48 /* organism.host2 */,
+				DCC3117D0762539F008F7A48 /* organism.infected */,
+				DCC3117E0762539F008F7A48 /* organism.infected2 */,
+				DCC3117F0762539F008F7A48 /* organism.noheads */,
 			);
-			isa = PBXGroup;
 			path = config;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311680762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.2paths;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311690762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.9resource;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116A0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.all_logic;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116B0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cascade;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116C0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.19.short;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116D0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.24.old;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116E0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.26.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3116F0762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.27.multi;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311700762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = "inst_set.27.no-nop";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311710762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.27.parasite;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311720762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.28.base;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311730762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.28.const;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311740762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.29.base_memsize;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311750762539E008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.31.multi;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311760762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.32.heads;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311770762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.heads.parasite;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311780762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.heads.100;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311790762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.heads.15;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117A0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.heads.50;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117B0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.host;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117C0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.host2;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117D0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.infected;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117E0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.infected2;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3117F0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.noheads;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311800762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311810762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = events.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311820762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311830762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis.4stack;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311840762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.4stack;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311850762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311860762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.sex;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311870762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.tmp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311890762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3118A0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.heads.100;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3118B0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.sex;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3118C0762539F008F7A48 = {
+		DCC3118C0762539F008F7A48 /* preset_organisms */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311940762539F008F7A48,
-				DCC311950762539F008F7A48,
-				DCC311970762539F008F7A48,
-				DCC311980762539F008F7A48,
+				DCC311940762539F008F7A48 /* CMakeLists.txt */,
+				DCC311950762539F008F7A48 /* dummy */,
+				DCC311970762539F008F7A48 /* organism.4stack */,
+				DCC311980762539F008F7A48 /* organism.parasite */,
 			);
-			isa = PBXGroup;
 			path = preset_organisms;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311940762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311950762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = dummy;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311970762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.4stack;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311980762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.parasite;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311990762539F008F7A48 = {
+		DCC311990762539F008F7A48 /* testsuites */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3119E0762539F008F7A48,
-				DCC3119F0762539F008F7A48,
-				DCC311FE0762539F008F7A48,
+				DCC3119E0762539F008F7A48 /* CMakeLists.txt */,
+				DCC3119F0762539F008F7A48 /* functional_testsuites */,
+				DCC311FE0762539F008F7A48 /* unit_testsuites */,
 			);
-			isa = PBXGroup;
 			path = testsuites;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3119E0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3119F0762539F008F7A48 = {
+		DCC3119F0762539F008F7A48 /* functional_testsuites */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311A30762539F008F7A48,
-				DCC311A80762539F008F7A48,
-				DCC311BB0762539F008F7A48,
-				DCC311D00762539F008F7A48,
-				DCC311E30762539F008F7A48,
-				DCC311E60762539F008F7A48,
-				DCC311EA0762539F008F7A48,
+				DCC311A30762539F008F7A48 /* config */,
+				DCC311A80762539F008F7A48 /* default.md5sum */,
+				DCC311BB0762539F008F7A48 /* default.tail */,
+				DCC311D00762539F008F7A48 /* default.tail.disabled */,
+				DCC311E30762539F008F7A48 /* demo.md5sum */,
+				DCC311E60762539F008F7A48 /* demo.tail.disabled */,
+				DCC311EA0762539F008F7A48 /* tedious.tail.disabled */,
 			);
-			isa = PBXGroup;
 			path = functional_testsuites;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311A30762539F008F7A48 = {
+		DCC311A30762539F008F7A48 /* config */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311A70762539F008F7A48,
+				DCC311A70762539F008F7A48 /* unix.exp */,
 			);
-			isa = PBXGroup;
 			path = config;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311A70762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.exports;
-			path = unix.exp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311A80762539F008F7A48 = {
+		DCC311A80762539F008F7A48 /* default.md5sum */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311B30762539F008F7A48,
-				DCC311B40762539F008F7A48,
-				DCC311B50762539F008F7A48,
-				DCC311B60762539F008F7A48,
-				DCC311B70762539F008F7A48,
-				DCC311B80762539F008F7A48,
-				DCC311B90762539F008F7A48,
-				DCC311BA0762539F008F7A48,
+				DCC311B30762539F008F7A48 /* analyze.cfg */,
+				DCC311B40762539F008F7A48 /* environment.cfg */,
+				DCC311B50762539F008F7A48 /* events.cfg */,
+				DCC311B60762539F008F7A48 /* genesis */,
+				DCC311B70762539F008F7A48 /* inst_set.default */,
+				DCC311B80762539F008F7A48 /* md5sum.exp */,
+				DCC311B90762539F008F7A48 /* md5sum.sh */,
+				DCC311BA0762539F008F7A48 /* organism.default */,
 			);
-			isa = PBXGroup;
 			path = default.md5sum;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311B30762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B40762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B50762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = events.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B60762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B70762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B80762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.exports;
-			path = md5sum.exp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311B90762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = md5sum.sh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311BA0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311BB0762539F008F7A48 = {
+		DCC311BB0762539F008F7A48 /* default.tail */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311C70762539F008F7A48,
-				DCC311C80762539F008F7A48,
-				DCC311C90762539F008F7A48,
-				DCC311CA0762539F008F7A48,
-				DCC311CB0762539F008F7A48,
-				DCC311CC0762539F008F7A48,
-				DCC311CD0762539F008F7A48,
-				DCC311CE0762539F008F7A48,
-				DCC311CF0762539F008F7A48,
+				DCC311C70762539F008F7A48 /* analyze.cfg */,
+				DCC311C80762539F008F7A48 /* detail_pop.100.last_line.expected */,
+				DCC311C90762539F008F7A48 /* environment.cfg */,
+				DCC311CA0762539F008F7A48 /* events.cfg */,
+				DCC311CB0762539F008F7A48 /* genesis */,
+				DCC311CC0762539F008F7A48 /* inst_set.default */,
+				DCC311CD0762539F008F7A48 /* organism.default */,
+				DCC311CE0762539F008F7A48 /* tail.exp */,
+				DCC311CF0762539F008F7A48 /* tail.sh */,
 			);
-			isa = PBXGroup;
 			path = default.tail;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311C70762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311C80762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = detail_pop.100.last_line.expected;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311C90762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CA0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = events.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CB0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CC0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CD0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CE0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.exports;
-			path = tail.exp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311CF0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = tail.sh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311D00762539F008F7A48 = {
+		DCC311D00762539F008F7A48 /* default.tail.disabled */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311DB0762539F008F7A48,
-				DCC311DC0762539F008F7A48,
-				DCC311DD0762539F008F7A48,
-				DCC311DE0762539F008F7A48,
-				DCC311DF0762539F008F7A48,
-				DCC311E00762539F008F7A48,
-				DCC311E10762539F008F7A48,
-				DCC311E20762539F008F7A48,
+				DCC311DB0762539F008F7A48 /* analyze.cfg */,
+				DCC311DC0762539F008F7A48 /* environment.cfg */,
+				DCC311DD0762539F008F7A48 /* events.cfg */,
+				DCC311DE0762539F008F7A48 /* genesis */,
+				DCC311DF0762539F008F7A48 /* inst_set.default */,
+				DCC311E00762539F008F7A48 /* organism.default */,
+				DCC311E10762539F008F7A48 /* tail.exp */,
+				DCC311E20762539F008F7A48 /* tail.sh */,
 			);
-			isa = PBXGroup;
 			path = default.tail.disabled;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311DB0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311DC0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311DD0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = events.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311DE0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311DF0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311E00762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311E10762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.exports;
-			path = tail.exp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311E20762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = tail.sh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311E30762539F008F7A48 = {
+		DCC311E30762539F008F7A48 /* demo.md5sum */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = demo.md5sum;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311E60762539F008F7A48 = {
+		DCC311E60762539F008F7A48 /* demo.tail.disabled */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = demo.tail.disabled;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311EA0762539F008F7A48 = {
+		DCC311EA0762539F008F7A48 /* tedious.tail.disabled */ = {
+			isa = PBXGroup;
 			children = (
-				DCC311F50762539F008F7A48,
-				DCC311F60762539F008F7A48,
-				DCC311F70762539F008F7A48,
-				DCC311F80762539F008F7A48,
-				DCC311F90762539F008F7A48,
-				DCC311FA0762539F008F7A48,
-				DCC311FB0762539F008F7A48,
-				DCC311FC0762539F008F7A48,
+				DCC311F50762539F008F7A48 /* analyze.cfg */,
+				DCC311F60762539F008F7A48 /* environment.cfg */,
+				DCC311F70762539F008F7A48 /* events.cfg */,
+				DCC311F80762539F008F7A48 /* genesis */,
+				DCC311F90762539F008F7A48 /* inst_set.default */,
+				DCC311FA0762539F008F7A48 /* organism.default */,
+				DCC311FB0762539F008F7A48 /* tail.exp */,
+				DCC311FC0762539F008F7A48 /* tail.sh */,
 			);
-			isa = PBXGroup;
 			path = tedious.tail.disabled;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC311F50762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = analyze.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311F60762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311F70762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = events.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311F80762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = genesis;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311F90762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = inst_set.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311FA0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = organism.default;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311FB0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.exports;
-			path = tail.exp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311FC0762539F008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = tail.sh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC311FE0762539F008F7A48 = {
+		DCC311FE0762539F008F7A48 /* unit_testsuites */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3128C076253A0008F7A48,
-				DCC3128D076253A0008F7A48,
-				DCC3128E076253A0008F7A48,
-				DCC3128F076253A0008F7A48,
-				DCC31290076253A0008F7A48,
-				DCC31291076253A0008F7A48,
-				DCC31292076253A0008F7A48,
-				DCC31293076253A0008F7A48,
-				DCC31294076253A0008F7A48,
-				DCC31295076253A0008F7A48,
-				DCC31296076253A0008F7A48,
-				DCC31297076253A0008F7A48,
-				DCC31298076253A0008F7A48,
-				DCC31299076253A0008F7A48,
-				DCC3129A076253A0008F7A48,
-				DCC3129B076253A0008F7A48,
-				DCC3129C076253A0008F7A48,
-				DCC3129D076253A0008F7A48,
-				DCC3129E076253A0008F7A48,
-				DCC3129F076253A0008F7A48,
-				DCC312A0076253A0008F7A48,
-				DCC312A1076253A0008F7A48,
-				DCC312A2076253A0008F7A48,
-				DCC312A3076253A0008F7A48,
-				DCC312A4076253A0008F7A48,
-				DCC312A5076253A0008F7A48,
-				DCC312A6076253A0008F7A48,
-				DCC312A7076253A0008F7A48,
-				DCC312A8076253A0008F7A48,
-				DCC312A9076253A0008F7A48,
-				DCC312AA076253A0008F7A48,
-				DCC312AB076253A0008F7A48,
-				DCC312AC076253A0008F7A48,
-				DCC312AD076253A0008F7A48,
-				DCC312AE076253A0008F7A48,
-				DCC312AF076253A0008F7A48,
-				DCC312B0076253A0008F7A48,
-				DCC312B1076253A0008F7A48,
-				DCC312B2076253A0008F7A48,
-				DCC312B3076253A0008F7A48,
-				DCC312B4076253A0008F7A48,
-				DCC312B5076253A0008F7A48,
-				DCC312B6076253A0008F7A48,
-				DCC312B7076253A0008F7A48,
-				DCC312B8076253A0008F7A48,
-				DCC312B9076253A0008F7A48,
-				DCC312BA076253A0008F7A48,
-				DCC312BB076253A0008F7A48,
-				DCC312BC076253A0008F7A48,
-				DCC312BD076253A0008F7A48,
-				DCC312BE076253A0008F7A48,
-				DCC312BF076253A0008F7A48,
-				DCC312C0076253A0008F7A48,
-				DCC312C1076253A0008F7A48,
-				DCC312C2076253A0008F7A48,
-				DCC312C3076253A0008F7A48,
-				DCC312C4076253A0008F7A48,
-				DCC312C5076253A0008F7A48,
-				DCC312C6076253A0008F7A48,
-				DCC312C7076253A0008F7A48,
-				DCC312C8076253A0008F7A48,
-				DCC312C9076253A0008F7A48,
-				DCC312CA076253A0008F7A48,
-				DCC312CB076253A0008F7A48,
-				DCC312CC076253A0008F7A48,
-				DCC312CD076253A0008F7A48,
-				DCC312CE076253A0008F7A48,
-				DCC312CF076253A0008F7A48,
-				DCC312D0076253A0008F7A48,
-				DCC312D1076253A0008F7A48,
-				DCC312D2076253A0008F7A48,
-				DCC312D3076253A0008F7A48,
-				DCC312D4076253A0008F7A48,
-				DCC312D5076253A0008F7A48,
-				DCC312D6076253A0008F7A48,
-				DCC312D7076253A0008F7A48,
-				DCC312D8076253A0008F7A48,
-				DCC312F3076253A0008F7A48,
-				DCC312FE076253A0008F7A48,
-				DCC312FF076253A0008F7A48,
-				DCC31300076253A0008F7A48,
-				DCC31302076253A0008F7A48,
-				DCC31303076253A0008F7A48,
-				DCC31304076253A0008F7A48,
-				DCC31305076253A0008F7A48,
-				DCC31306076253A0008F7A48,
-				DCC31307076253A0008F7A48,
-				DCC31308076253A0008F7A48,
-				DCC31309076253A0008F7A48,
-				DCC3130A076253A0008F7A48,
-				DCC3130B076253A0008F7A48,
-				DCC3130E076253A0008F7A48,
-				DCC3130F076253A0008F7A48,
-				DCC31310076253A0008F7A48,
-				DCC31311076253A0008F7A48,
-				DCC31312076253A0008F7A48,
-				DCC31313076253A0008F7A48,
-				DCC31314076253A0008F7A48,
-				DCC31315076253A0008F7A48,
-				DCC31316076253A0008F7A48,
-				DCC31317076253A0008F7A48,
-				DCC31318076253A0008F7A48,
-				DCC31319076253A0008F7A48,
-				DCC3131A076253A0008F7A48,
-				DCC3131B076253A0008F7A48,
-				DCC3131C076253A0008F7A48,
-				DCC3131D076253A0008F7A48,
-				DCC3131E076253A0008F7A48,
-				DCC3131F076253A0008F7A48,
-				DCC31320076253A0008F7A48,
-				DCC31321076253A0008F7A48,
-				DCC31322076253A0008F7A48,
-				DCC31323076253A0008F7A48,
-				DCC31324076253A0008F7A48,
-				DCC31325076253A0008F7A48,
-				DCC31326076253A0008F7A48,
-				DCC31327076253A0008F7A48,
-				DCC31328076253A0008F7A48,
-				DCC31329076253A0008F7A48,
-				DCC3132A076253A0008F7A48,
-				DCC3132B076253A0008F7A48,
-				DCC3132C076253A0008F7A48,
-				DCC3132D076253A0008F7A48,
-				DCC3132E076253A0008F7A48,
-				DCC3132F076253A0008F7A48,
-				DCC31330076253A0008F7A48,
-				DCC31331076253A0008F7A48,
-				DCC31332076253A0008F7A48,
-				DCC31333076253A0008F7A48,
-				DCC31334076253A0008F7A48,
-				DCC31335076253A0008F7A48,
-				DCC31336076253A0008F7A48,
-				DCC31337076253A0008F7A48,
-				DCC31338076253A0008F7A48,
-				DCC31339076253A0008F7A48,
-				DCC3133A076253A0008F7A48,
-				DCC3133B076253A0008F7A48,
-				DCC3133C076253A0008F7A48,
-				DCC3133D076253A0008F7A48,
-				DCC3133E076253A0008F7A48,
-				DCC3133F076253A0008F7A48,
+				DCC3128C076253A0008F7A48 /* 4stack_head.t.cc */,
+				DCC3128D076253A0008F7A48 /* analyze.t.cc */,
+				DCC3128E076253A0008F7A48 /* analyze_command.t.cc */,
+				DCC3128F076253A0008F7A48 /* analyze_command_def.t.cc */,
+				DCC31290076253A0008F7A48 /* analyze_command_def_base.t.cc */,
+				DCC31291076253A0008F7A48 /* analyze_flow_command.t.cc */,
+				DCC31292076253A0008F7A48 /* analyze_flow_command_def.t.cc */,
+				DCC31293076253A0008F7A48 /* analyze_function.t.cc */,
+				DCC31294076253A0008F7A48 /* analyze_genotype.t.cc */,
+				DCC31295076253A0008F7A48 /* analyze_util.t.cc */,
+				DCC31296076253A0008F7A48 /* avida.t.cc */,
+				DCC31297076253A0008F7A48 /* avida_driver_analyze.t.cc */,
+				DCC31298076253A0008F7A48 /* avida_driver_base.t.cc */,
+				DCC31299076253A0008F7A48 /* avida_driver_population.t.cc */,
+				DCC3129A076253A0008F7A48 /* avida_triggers.t.cc */,
+				DCC3129B076253A0008F7A48 /* birth_chamber.t.cc */,
+				DCC3129C076253A0008F7A48 /* block_struct.t.cc */,
+				DCC3129D076253A0008F7A48 /* callback_util.t.cc */,
+				DCC3129E076253A0008F7A48 /* CMakeLists.txt */,
+				DCC3129F076253A0008F7A48 /* config.t.cc */,
+				DCC312A0076253A0008F7A48 /* const_schedule.t.cc */,
+				DCC312A1076253A0008F7A48 /* cpu_head.t.cc */,
+				DCC312A2076253A0008F7A48 /* cpu_memory.t.cc */,
+				DCC312A3076253A0008F7A48 /* cpu_stack.t.cc */,
+				DCC312A4076253A0008F7A48 /* cpu_test_info.t.cc */,
+				DCC312A5076253A0008F7A48 /* data_entry.t.cc */,
+				DCC312A6076253A0008F7A48 /* data_file.t.cc */,
+				DCC312A7076253A0008F7A48 /* data_file_manager.t.cc */,
+				DCC312A8076253A0008F7A48 /* data_manager_base.t.cc */,
+				DCC312A9076253A0008F7A48 /* default_message_display.t.cc */,
+				DCC312AA076253A0008F7A48 /* environment.t.cc */,
+				DCC312AB076253A0008F7A48 /* event.t.cc */,
+				DCC312AC076253A0008F7A48 /* event_factory.t.cc */,
+				DCC312AD076253A0008F7A48 /* event_factory_manager.t.cc */,
+				DCC312AE076253A0008F7A48 /* event_list.t.cc */,
+				DCC312AF076253A0008F7A48 /* event_list_entry.t.cc */,
+				DCC312B0076253A0008F7A48 /* event_list_iterator.t.cc */,
+				DCC312B1076253A0008F7A48 /* file.t.cc */,
+				DCC312B2076253A0008F7A48 /* fitness_matrix.t.cc */,
+				DCC312B3076253A0008F7A48 /* fixed_coords.t.cc */,
+				DCC312B4076253A0008F7A48 /* functions.t.cc */,
+				DCC312B5076253A0008F7A48 /* genebank.t.cc */,
+				DCC312B6076253A0008F7A48 /* genesis.t.cc */,
+				DCC312B7076253A0008F7A48 /* genome.t.cc */,
+				DCC312B8076253A0008F7A48 /* genome_util.t.cc */,
+				DCC312B9076253A0008F7A48 /* genotype.t.cc */,
+				DCC312BA076253A0008F7A48 /* genotype_batch.t.cc */,
+				DCC312BB076253A0008F7A48 /* genotype_birth_data.t.cc */,
+				DCC312BC076253A0008F7A48 /* genotype_control.t.cc */,
+				DCC312BD076253A0008F7A48 /* hardware_4stack.t.cc */,
+				DCC312BE076253A0008F7A48 /* hardware_4stack_thread.t.cc */,
+				DCC312BF076253A0008F7A48 /* hardware_base.t.cc */,
+				DCC312C0076253A0008F7A48 /* hardware_cpu.t.cc */,
+				DCC312C1076253A0008F7A48 /* hardware_cpu_thread.t.cc */,
+				DCC312C2076253A0008F7A48 /* hardware_factory.t.cc */,
+				DCC312C3076253A0008F7A48 /* hardware_util.t.cc */,
+				DCC312C4076253A0008F7A48 /* help_alias.t.cc */,
+				DCC312C5076253A0008F7A48 /* help_entry.t.cc */,
+				DCC312C6076253A0008F7A48 /* help_full_entry.t.cc */,
+				DCC312C7076253A0008F7A48 /* help_manager.t.cc */,
+				DCC312C8076253A0008F7A48 /* help_type.t.cc */,
+				DCC312C9076253A0008F7A48 /* histogram.t.cc */,
+				DCC312CA076253A0008F7A48 /* indexed_block_struct.t.cc */,
+				DCC312CB076253A0008F7A48 /* init_file.t.cc */,
+				DCC312CC076253A0008F7A48 /* inject_genebank.t.cc */,
+				DCC312CD076253A0008F7A48 /* inject_genotype.t.cc */,
+				DCC312CE076253A0008F7A48 /* inject_genotype_birth_data.t.cc */,
+				DCC312CF076253A0008F7A48 /* inject_genotype_control.t.cc */,
+				DCC312D0076253A0008F7A48 /* inject_genotype_element.t.cc */,
+				DCC312D1076253A0008F7A48 /* inject_genotype_queue.t.cc */,
+				DCC312D2076253A0008F7A48 /* inst_lib_base.t.cc */,
+				DCC312D3076253A0008F7A48 /* inst_set.t.cc */,
+				DCC312D4076253A0008F7A48 /* inst_util.t.cc */,
+				DCC312D5076253A0008F7A48 /* integrated_schedule.t.cc */,
+				DCC312D6076253A0008F7A48 /* integrated_schedule_node.t.cc */,
+				DCC312D7076253A0008F7A48 /* landscape.t.cc */,
+				DCC312D8076253A0008F7A48 /* level_0 */,
+				DCC312F3076253A0008F7A48 /* level_1 */,
+				DCC312FE076253A0008F7A48 /* lineage.t.cc */,
+				DCC312FF076253A0008F7A48 /* lineage_control.t.cc */,
+				DCC31300076253A0008F7A48 /* local_mutations.t.cc */,
+				DCC31302076253A0008F7A48 /* message_class.t.cc */,
+				DCC31303076253A0008F7A48 /* message_closure.t.cc */,
+				DCC31304076253A0008F7A48 /* message_display.t.cc */,
+				DCC31305076253A0008F7A48 /* message_type.t.cc */,
+				DCC31306076253A0008F7A48 /* mutation.t.cc */,
+				DCC31307076253A0008F7A48 /* mutation_lib.t.cc */,
+				DCC31308076253A0008F7A48 /* mutation_rates.t.cc */,
+				DCC31309076253A0008F7A48 /* mx_code_array.t.cc */,
+				DCC3130A076253A0008F7A48 /* my_code_array_less_than.t.cc */,
+				DCC3130B076253A0008F7A48 /* ncurses_viewer */,
+				DCC3130E076253A0008F7A48 /* org_message.t.cc */,
+				DCC3130F076253A0008F7A48 /* organism.t.cc */,
+				DCC31310076253A0008F7A48 /* phenotype.t.cc */,
+				DCC31311076253A0008F7A48 /* population.t.cc */,
+				DCC31312076253A0008F7A48 /* population_cell.t.cc */,
+				DCC31313076253A0008F7A48 /* population_event.t.cc */,
+				DCC31314076253A0008F7A48 /* population_event_factory.t.cc */,
+				DCC31315076253A0008F7A48 /* population_interface.t.cc */,
+				DCC31316076253A0008F7A48 /* prob_schedule.t.cc */,
+				DCC31317076253A0008F7A48 /* random.t.cc */,
+				DCC31318076253A0008F7A48 /* reaction.t.cc */,
+				DCC31319076253A0008F7A48 /* reaction_lib.t.cc */,
+				DCC3131A076253A0008F7A48 /* reaction_process.t.cc */,
+				DCC3131B076253A0008F7A48 /* reaction_result.t.cc */,
+				DCC3131C076253A0008F7A48 /* ref_block.t.cc */,
+				DCC3131D076253A0008F7A48 /* resource.t.cc */,
+				DCC3131E076253A0008F7A48 /* resource_count.t.cc */,
+				DCC3131F076253A0008F7A48 /* resource_lib.t.cc */,
+				DCC31320076253A0008F7A48 /* running_average.t.cc */,
+				DCC31321076253A0008F7A48 /* scaled_block.t.cc */,
+				DCC31322076253A0008F7A48 /* schedule.t.cc */,
+				DCC31323076253A0008F7A48 /* spatial_count_elem.t.cc */,
+				DCC31324076253A0008F7A48 /* spatial_res_count.t.cc */,
+				DCC31325076253A0008F7A48 /* species.t.cc */,
+				DCC31326076253A0008F7A48 /* species_control.t.cc */,
+				DCC31327076253A0008F7A48 /* species_queue.t.cc */,
+				DCC31328076253A0008F7A48 /* stats.t.cc */,
+				DCC31329076253A0008F7A48 /* string.t.cc */,
+				DCC3132A076253A0008F7A48 /* string_iterator.t.cc */,
+				DCC3132B076253A0008F7A48 /* string_list.t.cc */,
+				DCC3132C076253A0008F7A48 /* string_util.t.cc */,
+				DCC3132D076253A0008F7A48 /* tArgDataEntry.t.cc */,
+				DCC3132E076253A0008F7A48 /* tArray.t.cc */,
+				DCC3132F076253A0008F7A48 /* task_entry.t.cc */,
+				DCC31330076253A0008F7A48 /* task_lib.t.cc */,
+				DCC31331076253A0008F7A48 /* tBuffer.t.cc */,
+				DCC31332076253A0008F7A48 /* tDataEntry.t.cc */,
+				DCC31333076253A0008F7A48 /* tDataEntryBase.t.cc */,
+				DCC31334076253A0008F7A48 /* tDataEntryCommand.t.cc */,
+				DCC31335076253A0008F7A48 /* tDataManager.t.cc */,
+				DCC31336076253A0008F7A48 /* tDictionary.t.cc */,
+				DCC31337076253A0008F7A48 /* template.t.cc */,
+				DCC31338076253A0008F7A48 /* test_cpu.t.cc */,
+				DCC31339076253A0008F7A48 /* test_util.t.cc */,
+				DCC3133A076253A0008F7A48 /* tList.t.cc */,
+				DCC3133B076253A0008F7A48 /* tMatrix.t.cc */,
+				DCC3133C076253A0008F7A48 /* tools.t.cc */,
+				DCC3133D076253A0008F7A48 /* tVector.t.cc */,
+				DCC3133E076253A0008F7A48 /* uint.t.cc */,
+				DCC3133F076253A0008F7A48 /* weighted_index.t.cc */,
 			);
-			isa = PBXGroup;
 			path = unit_testsuites;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3128C076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = 4stack_head.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3128D076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3128E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_command.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3128F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_command_def.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31290076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_command_def_base.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31291076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_flow_command.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31292076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_flow_command_def.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31293076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_function.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31294076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_genotype.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31295076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = analyze_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31296076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31297076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_analyze.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31298076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_base.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31299076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_driver_population.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = avida_triggers.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129B076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = birth_chamber.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129C076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = block_struct.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129D076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = callback_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3129F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = config.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A0076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = const_schedule.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A1076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_head.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A2076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_memory.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A3076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_stack.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A4076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_test_info.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A5076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_entry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A6076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_file.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A7076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_file_manager.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A8076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_manager_base.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312A9076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = default_message_display.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AA076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = environment.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AB076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AC076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_factory.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AD076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_factory_manager.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AE076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312AF076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list_entry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B0076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_list_iterator.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B1076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = file.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B2076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = fitness_matrix.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B3076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = fixed_coords.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B4076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = functions.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B5076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genebank.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B6076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genesis.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B7076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genome.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B8076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genome_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312B9076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BA076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_batch.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BB076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_birth_data.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BC076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_control.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BD076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_4stack.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BE076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_4stack_thread.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312BF076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_base.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C0076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_cpu.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C1076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_cpu_thread.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C2076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_factory.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C3076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hardware_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C4076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_alias.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C5076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_entry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C6076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_full_entry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C7076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_manager.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C8076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_type.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312C9076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = histogram.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CA076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = indexed_block_struct.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CB076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = init_file.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CC076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genebank.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CD076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CE076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_birth_data.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312CF076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_control.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D0076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_element.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D1076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inject_genotype_queue.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D2076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inst_lib_base.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D3076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inst_set.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D4076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = inst_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D5076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = integrated_schedule.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D6076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = integrated_schedule_node.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D7076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = landscape.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312D8076253A0008F7A48 = {
+		DCC312D8076253A0008F7A48 /* level_0 */ = {
+			isa = PBXGroup;
 			children = (
-				DCC312E7076253A0008F7A48,
-				DCC312E8076253A0008F7A48,
-				DCC312E9076253A0008F7A48,
-				DCC312EA076253A0008F7A48,
-				DCC312EB076253A0008F7A48,
-				DCC312EC076253A0008F7A48,
-				DCC312ED076253A0008F7A48,
-				DCC312EE076253A0008F7A48,
-				DCC312F0076253A0008F7A48,
-				DCC312F1076253A0008F7A48,
-				DCC312F2076253A0008F7A48,
+				DCC312E7076253A0008F7A48 /* CMakeLists.txt */,
+				DCC312E8076253A0008F7A48 /* count_tracker.t.cc */,
+				DCC312E9076253A0008F7A48 /* cpu_stats.t.cc */,
+				DCC312EA076253A0008F7A48 /* double_sum.t.cc */,
+				DCC312EB076253A0008F7A48 /* event_triggers.t.cc */,
+				DCC312EC076253A0008F7A48 /* fixed_block.t.cc */,
+				DCC312ED076253A0008F7A48 /* genotype_test_data.t.cc */,
+				DCC312EE076253A0008F7A48 /* int_sum.t.cc */,
+				DCC312F0076253A0008F7A48 /* memory_flags.t.cc */,
+				DCC312F1076253A0008F7A48 /* merit.t.cc */,
+				DCC312F2076253A0008F7A48 /* template.t.cc */,
 			);
-			isa = PBXGroup;
 			path = level_0;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC312E7076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312E8076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = count_tracker.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312E9076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cpu_stats.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312EA076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = double_sum.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312EB076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = event_triggers.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312EC076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = fixed_block.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312ED076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genotype_test_data.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312EE076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = int_sum.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312F0076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = memory_flags.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312F1076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = merit.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312F2076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = template.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312F3076253A0008F7A48 = {
+		DCC312F3076253A0008F7A48 /* level_1 */ = {
+			isa = PBXGroup;
 			children = (
-				DCC312FA076253A0008F7A48,
-				DCC312FB076253A0008F7A48,
-				DCC312FC076253A0008F7A48,
+				DCC312FA076253A0008F7A48 /* CMakeLists.txt */,
+				DCC312FB076253A0008F7A48 /* code_label.t.cc */,
+				DCC312FC076253A0008F7A48 /* instruction.t.cc */,
 			);
-			isa = PBXGroup;
 			path = level_1;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC312FA076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312FB076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = code_label.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312FC076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = instruction.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312FE076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = lineage.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC312FF076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = lineage_control.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31300076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = local_mutations.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31302076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = message_class.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31303076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = message_closure.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31304076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = message_display.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31305076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = message_type.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31306076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31307076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation_lib.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31308076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mutation_rates.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31309076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = mx_code_array.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3130A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = my_code_array_less_than.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3130B076253A0008F7A48 = {
+		DCC3130B076253A0008F7A48 /* ncurses_viewer */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = ncurses_viewer;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3130E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = org_message.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3130F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = organism.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31310076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = phenotype.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31311076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31312076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_cell.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31313076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_event.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31314076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_event_factory.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31315076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = population_interface.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31316076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = prob_schedule.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31317076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = random.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31318076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31319076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_lib.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_process.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131B076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = reaction_result.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131C076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = ref_block.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131D076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource_count.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3131F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = resource_lib.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31320076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = running_average.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31321076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = scaled_block.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31322076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = schedule.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31323076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = spatial_count_elem.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31324076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = spatial_res_count.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31325076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31326076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species_control.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31327076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = species_queue.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31328076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = stats.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31329076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_iterator.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132B076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_list.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132C076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132D076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tArgDataEntry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tArray.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3132F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_entry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31330076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_lib.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31331076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tBuffer.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31332076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tDataEntry.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31333076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tDataEntryBase.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31334076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tDataEntryCommand.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31335076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tDataManager.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31336076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tDictionary.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31337076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = template.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31338076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_cpu.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31339076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_util.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tList.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133B076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tMatrix.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133C076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tools.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133D076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tVector.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133E076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = uint.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3133F076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = weighted_index.t.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31340076253A0008F7A48 = {
+		DCC31340076253A0008F7A48 /* third-party */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31345076253A0008F7A48,
-				DCC31346076253A0008F7A48,
-				DCC31402076253A1008F7A48,
-				DCC3141D076253A1008F7A48,
-				DCC31426076253A1008F7A48,
-				DCC31429076253A1008F7A48,
-				DCC31476076253A1008F7A48,
-				DCC314A9076253A2008F7A48,
+				DCC31345076253A0008F7A48 /* CMakeLists.txt */,
+				DCC31346076253A0008F7A48 /* Loki */,
+				DCC31402076253A1008F7A48 /* mockpp */,
+				DCC3141D076253A1008F7A48 /* pdcurses */,
+				DCC31426076253A1008F7A48 /* PDCurses-2.6 */,
+				DCC31429076253A1008F7A48 /* trio */,
+				DCC31476076253A1008F7A48 /* trio-1.9 */,
+				DCC314A9076253A2008F7A48 /* yaktest */,
 			);
-			isa = PBXGroup;
 			path = "third-party";
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31345076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31346076253A0008F7A48 = {
+		DCC31346076253A0008F7A48 /* Loki */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31361076253A0008F7A48,
-				DCC31362076253A0008F7A48,
-				DCC31363076253A0008F7A48,
-				DCC31366076253A0008F7A48,
-				DCC31367076253A0008F7A48,
-				DCC31368076253A0008F7A48,
-				DCC31369076253A0008F7A48,
-				DCC3136A076253A0008F7A48,
-				DCC3136C076253A0008F7A48,
-				DCC313B3076253A1008F7A48,
-				DCC313B4076253A1008F7A48,
-				DCC313B5076253A1008F7A48,
-				DCC313B6076253A1008F7A48,
-				DCC313E5076253A1008F7A48,
-				DCC313E6076253A1008F7A48,
-				DCC313E7076253A1008F7A48,
-				DCC313E8076253A1008F7A48,
-				DCC313E9076253A1008F7A48,
-				DCC313EA076253A1008F7A48,
-				DCC313EB076253A1008F7A48,
-				DCC313EC076253A1008F7A48,
-				DCC313FB076253A1008F7A48,
-				DCC313FC076253A1008F7A48,
-				DCC313FD076253A1008F7A48,
-				DCC313FE076253A1008F7A48,
-				DCC313FF076253A1008F7A48,
-				DCC31400076253A1008F7A48,
+				DCC31361076253A0008F7A48 /* AbstractFactory.h */,
+				DCC31362076253A0008F7A48 /* AssocVector.h */,
+				DCC31363076253A0008F7A48 /* Borland */,
+				DCC31366076253A0008F7A48 /* EmptyType.h */,
+				DCC31367076253A0008F7A48 /* Factory.h */,
+				DCC31368076253A0008F7A48 /* Functor.h */,
+				DCC31369076253A0008F7A48 /* HierarchyGenerators.h */,
+				DCC3136A076253A0008F7A48 /* Loki.pri */,
+				DCC3136C076253A0008F7A48 /* MSVC */,
+				DCC313B3076253A1008F7A48 /* MultiMethods.h */,
+				DCC313B4076253A1008F7A48 /* NullType.h */,
+				DCC313B5076253A1008F7A48 /* readme.txt */,
+				DCC313B6076253A1008F7A48 /* Reference */,
+				DCC313E5076253A1008F7A48 /* Singleton.cpp */,
+				DCC313E6076253A1008F7A48 /* Singleton.h */,
+				DCC313E7076253A1008F7A48 /* SmallObj.cpp */,
+				DCC313E8076253A1008F7A48 /* SmallObj.h */,
+				DCC313E9076253A1008F7A48 /* SmartPtr.h */,
+				DCC313EA076253A1008F7A48 /* static_check.h */,
+				DCC313EB076253A1008F7A48 /* Threads.h */,
+				DCC313EC076253A1008F7A48 /* tools */,
+				DCC313FB076253A1008F7A48 /* Tuple.h */,
+				DCC313FC076253A1008F7A48 /* TypeInfo.h */,
+				DCC313FD076253A1008F7A48 /* Typelist.h */,
+				DCC313FE076253A1008F7A48 /* TypeManip.h */,
+				DCC313FF076253A1008F7A48 /* TypeTraits.h */,
+				DCC31400076253A1008F7A48 /* Visitor.h */,
 			);
-			isa = PBXGroup;
 			path = Loki;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31361076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AbstractFactory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31362076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AssocVector.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31363076253A0008F7A48 = {
+		DCC31363076253A0008F7A48 /* Borland */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = Borland;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31366076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = EmptyType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31367076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Factory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31368076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Functor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31369076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = HierarchyGenerators.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3136A076253A0008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = Loki.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3136C076253A0008F7A48 = {
+		DCC3136C076253A0008F7A48 /* MSVC */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3136F076253A1008F7A48,
-				DCC3137E076253A1008F7A48,
+				DCC3136F076253A1008F7A48 /* 1200 */,
+				DCC3137E076253A1008F7A48 /* 1300 */,
 			);
-			isa = PBXGroup;
 			path = MSVC;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3136F076253A1008F7A48 = {
+		DCC3136F076253A1008F7A48 /* 1200 */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31378076253A1008F7A48,
-				DCC31379076253A1008F7A48,
-				DCC3137A076253A1008F7A48,
-				DCC3137B076253A1008F7A48,
-				DCC3137C076253A1008F7A48,
-				DCC3137D076253A1008F7A48,
+				DCC31378076253A1008F7A48 /* EmptyType.h */,
+				DCC31379076253A1008F7A48 /* NullType.h */,
+				DCC3137A076253A1008F7A48 /* portby.txt */,
+				DCC3137B076253A1008F7A48 /* TypeList.h */,
+				DCC3137C076253A1008F7A48 /* TypeManip.h */,
+				DCC3137D076253A1008F7A48 /* TypeTraits.h */,
 			);
-			isa = PBXGroup;
 			path = 1200;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31378076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = EmptyType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31379076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = NullType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3137A076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = portby.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3137B076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeList.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3137C076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeManip.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3137D076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeTraits.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3137E076253A1008F7A48 = {
+		DCC3137E076253A1008F7A48 /* 1300 */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3139A076253A1008F7A48,
-				DCC3139B076253A1008F7A48,
-				DCC3139C076253A1008F7A48,
-				DCC3139D076253A1008F7A48,
-				DCC3139E076253A1008F7A48,
-				DCC3139F076253A1008F7A48,
-				DCC313A0076253A1008F7A48,
-				DCC313A1076253A1008F7A48,
-				DCC313A2076253A1008F7A48,
-				DCC313A3076253A1008F7A48,
-				DCC313A4076253A1008F7A48,
-				DCC313A5076253A1008F7A48,
-				DCC313A6076253A1008F7A48,
-				DCC313A7076253A1008F7A48,
-				DCC313A8076253A1008F7A48,
-				DCC313A9076253A1008F7A48,
-				DCC313AA076253A1008F7A48,
-				DCC313AB076253A1008F7A48,
-				DCC313AC076253A1008F7A48,
-				DCC313AD076253A1008F7A48,
-				DCC313AE076253A1008F7A48,
-				DCC313AF076253A1008F7A48,
-				DCC313B0076253A1008F7A48,
-				DCC313B1076253A1008F7A48,
-				DCC313B2076253A1008F7A48,
+				DCC3139A076253A1008F7A48 /* AbstractFactory.h */,
+				DCC3139B076253A1008F7A48 /* AssocVector.h */,
+				DCC3139C076253A1008F7A48 /* EmptyType.h */,
+				DCC3139D076253A1008F7A48 /* Factory.h */,
+				DCC3139E076253A1008F7A48 /* Functor.h */,
+				DCC3139F076253A1008F7A48 /* HierarchyGenerators.h */,
+				DCC313A0076253A1008F7A48 /* MinMax.h */,
+				DCC313A1076253A1008F7A48 /* MultiMethods.h */,
+				DCC313A2076253A1008F7A48 /* NullType.h */,
+				DCC313A3076253A1008F7A48 /* portby.txt */,
+				DCC313A4076253A1008F7A48 /* readme.txt */,
+				DCC313A5076253A1008F7A48 /* Singleton.cpp */,
+				DCC313A6076253A1008F7A48 /* Singleton.h */,
+				DCC313A7076253A1008F7A48 /* SmallObj.cpp */,
+				DCC313A8076253A1008F7A48 /* SmallObj.h */,
+				DCC313A9076253A1008F7A48 /* SmartPtr.h */,
+				DCC313AA076253A1008F7A48 /* static_check.h */,
+				DCC313AB076253A1008F7A48 /* Threads.h */,
+				DCC313AC076253A1008F7A48 /* TypeInfo.h */,
+				DCC313AD076253A1008F7A48 /* TypeList.h */,
+				DCC313AE076253A1008F7A48 /* TypeManip.h */,
+				DCC313AF076253A1008F7A48 /* TypeTraits.h */,
+				DCC313B0076253A1008F7A48 /* Variant.h */,
+				DCC313B1076253A1008F7A48 /* VC_Alignment.h */,
+				DCC313B2076253A1008F7A48 /* Visitor.h */,
 			);
-			isa = PBXGroup;
 			path = 1300;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3139A076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AbstractFactory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3139B076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AssocVector.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3139C076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = EmptyType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3139D076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Factory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3139E076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Functor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3139F076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = HierarchyGenerators.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A0076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = MinMax.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A1076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = MultiMethods.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A2076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = NullType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A3076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = portby.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A4076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = readme.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A5076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = Singleton.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A6076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Singleton.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A7076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = SmallObj.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A8076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmallObj.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313A9076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmartPtr.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AA076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = static_check.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AB076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Threads.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AC076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeInfo.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AD076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeList.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AE076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeManip.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313AF076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeTraits.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B0076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Variant.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B1076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = VC_Alignment.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B2076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Visitor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B3076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = MultiMethods.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B4076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = NullType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B5076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = readme.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313B6076253A1008F7A48 = {
+		DCC313B6076253A1008F7A48 /* Reference */ = {
+			isa = PBXGroup;
 			children = (
-				DCC313CF076253A1008F7A48,
-				DCC313D0076253A1008F7A48,
-				DCC313D1076253A1008F7A48,
-				DCC313D2076253A1008F7A48,
-				DCC313D3076253A1008F7A48,
-				DCC313D4076253A1008F7A48,
-				DCC313D5076253A1008F7A48,
-				DCC313D6076253A1008F7A48,
-				DCC313D7076253A1008F7A48,
-				DCC313D8076253A1008F7A48,
-				DCC313D9076253A1008F7A48,
-				DCC313DA076253A1008F7A48,
-				DCC313DB076253A1008F7A48,
-				DCC313DC076253A1008F7A48,
-				DCC313DD076253A1008F7A48,
-				DCC313DE076253A1008F7A48,
-				DCC313DF076253A1008F7A48,
-				DCC313E0076253A1008F7A48,
-				DCC313E1076253A1008F7A48,
-				DCC313E2076253A1008F7A48,
-				DCC313E3076253A1008F7A48,
-				DCC313E4076253A1008F7A48,
+				DCC313CF076253A1008F7A48 /* AbstractFactory.h */,
+				DCC313D0076253A1008F7A48 /* AssocVector.h */,
+				DCC313D1076253A1008F7A48 /* EmptyType.h */,
+				DCC313D2076253A1008F7A48 /* Factory.h */,
+				DCC313D3076253A1008F7A48 /* Functor.h */,
+				DCC313D4076253A1008F7A48 /* HierarchyGenerators.h */,
+				DCC313D5076253A1008F7A48 /* MultiMethods.h */,
+				DCC313D6076253A1008F7A48 /* NullType.h */,
+				DCC313D7076253A1008F7A48 /* readme.txt */,
+				DCC313D8076253A1008F7A48 /* Singleton.cpp */,
+				DCC313D9076253A1008F7A48 /* Singleton.h */,
+				DCC313DA076253A1008F7A48 /* SmallObj.cpp */,
+				DCC313DB076253A1008F7A48 /* SmallObj.h */,
+				DCC313DC076253A1008F7A48 /* SmartPtr.h */,
+				DCC313DD076253A1008F7A48 /* static_check.h */,
+				DCC313DE076253A1008F7A48 /* Threads.h */,
+				DCC313DF076253A1008F7A48 /* Tuple.h */,
+				DCC313E0076253A1008F7A48 /* TypeInfo.h */,
+				DCC313E1076253A1008F7A48 /* Typelist.h */,
+				DCC313E2076253A1008F7A48 /* TypeManip.h */,
+				DCC313E3076253A1008F7A48 /* TypeTraits.h */,
+				DCC313E4076253A1008F7A48 /* Visitor.h */,
 			);
-			isa = PBXGroup;
 			path = Reference;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313CF076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AbstractFactory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D0076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = AssocVector.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D1076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = EmptyType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D2076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Factory.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D3076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Functor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D4076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = HierarchyGenerators.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D5076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = MultiMethods.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D6076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = NullType.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D7076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = readme.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D8076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = Singleton.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313D9076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Singleton.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DA076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = SmallObj.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DB076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmallObj.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DC076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmartPtr.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DD076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = static_check.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DE076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Threads.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313DF076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Tuple.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E0076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeInfo.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E1076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Typelist.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E2076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeManip.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E3076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeTraits.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E4076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Visitor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E5076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = Singleton.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E6076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Singleton.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E7076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = SmallObj.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E8076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmallObj.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313E9076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SmartPtr.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313EA076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = static_check.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313EB076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Threads.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313EC076253A1008F7A48 = {
+		DCC313EC076253A1008F7A48 /* tools */ = {
+			isa = PBXGroup;
 			children = (
-				DCC313EF076253A1008F7A48,
-				DCC313F2076253A1008F7A48,
-				DCC313F8076253A1008F7A48,
+				DCC313EF076253A1008F7A48 /* HeaderGen */,
+				DCC313F2076253A1008F7A48 /* RegressionTest */,
+				DCC313F8076253A1008F7A48 /* RegressionTest2 */,
 			);
-			isa = PBXGroup;
 			path = tools;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313EF076253A1008F7A48 = {
+		DCC313EF076253A1008F7A48 /* HeaderGen */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = HeaderGen;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313F2076253A1008F7A48 = {
+		DCC313F2076253A1008F7A48 /* RegressionTest */ = {
+			isa = PBXGroup;
 			children = (
-				DCC313F5076253A1008F7A48,
+				DCC313F5076253A1008F7A48 /* AllTest */,
 			);
-			isa = PBXGroup;
 			path = RegressionTest;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313F5076253A1008F7A48 = {
+		DCC313F5076253A1008F7A48 /* AllTest */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = AllTest;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313F8076253A1008F7A48 = {
+		DCC313F8076253A1008F7A48 /* RegressionTest2 */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = RegressionTest2;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC313FB076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Tuple.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313FC076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeInfo.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313FD076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Typelist.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313FE076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeManip.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC313FF076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = TypeTraits.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31400076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = Visitor.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31402076253A1008F7A48 = {
+		DCC31402076253A1008F7A48 /* mockpp */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31405076253A1008F7A48,
-				DCC31408076253A1008F7A48,
-				DCC31411076253A1008F7A48,
-				DCC31414076253A1008F7A48,
-				DCC31417076253A1008F7A48,
-				DCC3141A076253A1008F7A48,
+				DCC31405076253A1008F7A48 /* compat */,
+				DCC31408076253A1008F7A48 /* docs */,
+				DCC31411076253A1008F7A48 /* examples */,
+				DCC31414076253A1008F7A48 /* po */,
+				DCC31417076253A1008F7A48 /* tests */,
+				DCC3141A076253A1008F7A48 /* util */,
 			);
-			isa = PBXGroup;
 			path = mockpp;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31405076253A1008F7A48 = {
+		DCC31405076253A1008F7A48 /* compat */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = compat;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31408076253A1008F7A48 = {
+		DCC31408076253A1008F7A48 /* docs */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3140B076253A1008F7A48,
-				DCC3140E076253A1008F7A48,
+				DCC3140B076253A1008F7A48 /* api */,
+				DCC3140E076253A1008F7A48 /* en */,
 			);
-			isa = PBXGroup;
 			path = docs;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3140B076253A1008F7A48 = {
+		DCC3140B076253A1008F7A48 /* api */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = api;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3140E076253A1008F7A48 = {
+		DCC3140E076253A1008F7A48 /* en */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = en;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31411076253A1008F7A48 = {
+		DCC31411076253A1008F7A48 /* examples */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = examples;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31414076253A1008F7A48 = {
+		DCC31414076253A1008F7A48 /* po */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = po;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31417076253A1008F7A48 = {
+		DCC31417076253A1008F7A48 /* tests */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = tests;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3141A076253A1008F7A48 = {
+		DCC3141A076253A1008F7A48 /* util */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = util;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3141D076253A1008F7A48 = {
+		DCC3141D076253A1008F7A48 /* pdcurses */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31423076253A1008F7A48,
-				DCC31424076253A1008F7A48,
-				DCC31425076253A1008F7A48,
+				DCC31423076253A1008F7A48 /* curses.h */,
+				DCC31424076253A1008F7A48 /* pdcurses.lib */,
+				DCC31425076253A1008F7A48 /* README.txt */,
 			);
-			isa = PBXGroup;
 			path = pdcurses;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31423076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = curses.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31424076253A1008F7A48 = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			path = pdcurses.lib;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31425076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = README.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31426076253A1008F7A48 = {
+		DCC31426076253A1008F7A48 /* PDCurses-2.6 */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = "PDCurses-2.6";
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31429076253A1008F7A48 = {
+		DCC31429076253A1008F7A48 /* trio */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3143B076253A1008F7A48,
-				DCC3143C076253A1008F7A48,
-				DCC3143D076253A1008F7A48,
-				DCC31454076253A1008F7A48,
-				DCC31455076253A1008F7A48,
-				DCC3146B076253A1008F7A48,
-				DCC3146C076253A1008F7A48,
-				DCC3146D076253A1008F7A48,
-				DCC3146E076253A1008F7A48,
-				DCC3146F076253A1008F7A48,
-				DCC31470076253A1008F7A48,
-				DCC31471076253A1008F7A48,
-				DCC31472076253A1008F7A48,
-				DCC31473076253A1008F7A48,
-				DCC31474076253A1008F7A48,
-				DCC31475076253A1008F7A48,
+				DCC3143B076253A1008F7A48 /* CMakeLists.txt */,
+				DCC3143C076253A1008F7A48 /* compare.c */,
+				DCC3143D076253A1008F7A48 /* doc */,
+				DCC31454076253A1008F7A48 /* example.c */,
+				DCC31455076253A1008F7A48 /* html */,
+				DCC3146B076253A1008F7A48 /* regression.c */,
+				DCC3146C076253A1008F7A48 /* strio.h */,
+				DCC3146D076253A1008F7A48 /* trio.c */,
+				DCC3146E076253A1008F7A48 /* trio.h */,
+				DCC3146F076253A1008F7A48 /* trio.pri */,
+				DCC31470076253A1008F7A48 /* triodef.h */,
+				DCC31471076253A1008F7A48 /* trionan.c */,
+				DCC31472076253A1008F7A48 /* trionan.h */,
+				DCC31473076253A1008F7A48 /* triop.h */,
+				DCC31474076253A1008F7A48 /* triostr.c */,
+				DCC31475076253A1008F7A48 /* triostr.h */,
 			);
-			isa = PBXGroup;
 			path = trio;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3143B076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3143C076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = compare.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3143D076253A1008F7A48 = {
+		DCC3143D076253A1008F7A48 /* doc */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3144A076253A1008F7A48,
-				DCC3144B076253A1008F7A48,
-				DCC3144C076253A1008F7A48,
-				DCC3144D076253A1008F7A48,
-				DCC3144E076253A1008F7A48,
-				DCC3144F076253A1008F7A48,
-				DCC31450076253A1008F7A48,
-				DCC31451076253A1008F7A48,
-				DCC31452076253A1008F7A48,
-				DCC31453076253A1008F7A48,
+				DCC3144A076253A1008F7A48 /* doc.h */,
+				DCC3144B076253A1008F7A48 /* doc_dynamic.h */,
+				DCC3144C076253A1008F7A48 /* doc_printf.h */,
+				DCC3144D076253A1008F7A48 /* doc_register.h */,
+				DCC3144E076253A1008F7A48 /* doc_scanf.h */,
+				DCC3144F076253A1008F7A48 /* doc_static.h */,
+				DCC31450076253A1008F7A48 /* footer.html */,
+				DCC31451076253A1008F7A48 /* header.html */,
+				DCC31452076253A1008F7A48 /* trio.cfg */,
+				DCC31453076253A1008F7A48 /* trio.css */,
 			);
-			isa = PBXGroup;
 			path = doc;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3144A076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3144B076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc_dynamic.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3144C076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc_printf.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3144D076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc_register.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3144E076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc_scanf.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3144F076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = doc_static.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31450076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = footer.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31451076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = header.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31452076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = trio.cfg;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31453076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = trio.css;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31454076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = example.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31455076253A1008F7A48 = {
+		DCC31455076253A1008F7A48 /* html */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31461076253A1008F7A48,
-				DCC31462076253A1008F7A48,
-				DCC31463076253A1008F7A48,
-				DCC31464076253A1008F7A48,
-				DCC31465076253A1008F7A48,
-				DCC31466076253A1008F7A48,
-				DCC31467076253A1008F7A48,
-				DCC31468076253A1008F7A48,
-				DCC31469076253A1008F7A48,
+				DCC31461076253A1008F7A48 /* group___dynamic_strings.html */,
+				DCC31462076253A1008F7A48 /* group___printf.html */,
+				DCC31463076253A1008F7A48 /* group___scanf.html */,
+				DCC31464076253A1008F7A48 /* group___special_quantities.html */,
+				DCC31465076253A1008F7A48 /* group___static_strings.html */,
+				DCC31466076253A1008F7A48 /* group___user_defined.html */,
+				DCC31467076253A1008F7A48 /* index.html */,
+				DCC31468076253A1008F7A48 /* modules.html */,
+				DCC31469076253A1008F7A48 /* trio.css */,
 			);
-			isa = PBXGroup;
 			path = html;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31461076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___dynamic_strings.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31462076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___printf.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31463076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___scanf.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31464076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___special_quantities.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31465076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___static_strings.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31466076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = group___user_defined.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31467076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = index.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31468076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.html;
-			path = modules.html;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31469076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = trio.css;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3146B076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = regression.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3146C076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = strio.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3146D076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = trio.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3146E076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = trio.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3146F076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = trio.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31470076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = triodef.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31471076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = trionan.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31472076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = trionan.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31473076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = triop.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31474076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = triostr.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31475076253A1008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = triostr.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31476076253A1008F7A48 = {
+		DCC31476076253A1008F7A48 /* trio-1.9 */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31479076253A1008F7A48,
-				DCC3147C076253A1008F7A48,
-				DCC3147F076253A1008F7A48,
-				DCC3149A076253A2008F7A48,
-				DCC314A3076253A2008F7A48,
+				DCC31479076253A1008F7A48 /* doc */,
+				DCC3147C076253A1008F7A48 /* html */,
+				DCC3147F076253A1008F7A48 /* mockpp */,
+				DCC3149A076253A2008F7A48 /* trio */,
+				DCC314A3076253A2008F7A48 /* yaktest */,
 			);
-			isa = PBXGroup;
 			path = "trio-1.9";
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31479076253A1008F7A48 = {
+		DCC31479076253A1008F7A48 /* doc */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = doc;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3147C076253A1008F7A48 = {
+		DCC3147C076253A1008F7A48 /* html */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = html;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3147F076253A1008F7A48 = {
+		DCC3147F076253A1008F7A48 /* mockpp */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31482076253A2008F7A48,
-				DCC31485076253A2008F7A48,
-				DCC3148E076253A2008F7A48,
-				DCC31491076253A2008F7A48,
-				DCC31494076253A2008F7A48,
-				DCC31497076253A2008F7A48,
+				DCC31482076253A2008F7A48 /* compat */,
+				DCC31485076253A2008F7A48 /* docs */,
+				DCC3148E076253A2008F7A48 /* examples */,
+				DCC31491076253A2008F7A48 /* po */,
+				DCC31494076253A2008F7A48 /* tests */,
+				DCC31497076253A2008F7A48 /* util */,
 			);
-			isa = PBXGroup;
 			path = mockpp;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31482076253A2008F7A48 = {
+		DCC31482076253A2008F7A48 /* compat */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = compat;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31485076253A2008F7A48 = {
+		DCC31485076253A2008F7A48 /* docs */ = {
+			isa = PBXGroup;
 			children = (
-				DCC31488076253A2008F7A48,
-				DCC3148B076253A2008F7A48,
+				DCC31488076253A2008F7A48 /* api */,
+				DCC3148B076253A2008F7A48 /* en */,
 			);
-			isa = PBXGroup;
 			path = docs;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31488076253A2008F7A48 = {
+		DCC31488076253A2008F7A48 /* api */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = api;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3148B076253A2008F7A48 = {
+		DCC3148B076253A2008F7A48 /* en */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = en;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3148E076253A2008F7A48 = {
+		DCC3148E076253A2008F7A48 /* examples */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = examples;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31491076253A2008F7A48 = {
+		DCC31491076253A2008F7A48 /* po */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = po;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31494076253A2008F7A48 = {
+		DCC31494076253A2008F7A48 /* tests */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = tests;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31497076253A2008F7A48 = {
+		DCC31497076253A2008F7A48 /* util */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = util;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3149A076253A2008F7A48 = {
+		DCC3149A076253A2008F7A48 /* trio */ = {
+			isa = PBXGroup;
 			children = (
-				DCC3149D076253A2008F7A48,
-				DCC314A0076253A2008F7A48,
+				DCC3149D076253A2008F7A48 /* doc */,
+				DCC314A0076253A2008F7A48 /* html */,
 			);
-			isa = PBXGroup;
 			path = trio;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC3149D076253A2008F7A48 = {
+		DCC3149D076253A2008F7A48 /* doc */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = doc;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314A0076253A2008F7A48 = {
+		DCC314A0076253A2008F7A48 /* html */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = html;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314A3076253A2008F7A48 = {
+		DCC314A3076253A2008F7A48 /* yaktest */ = {
+			isa = PBXGroup;
 			children = (
-				DCC314A6076253A2008F7A48,
+				DCC314A6076253A2008F7A48 /* example */,
 			);
-			isa = PBXGroup;
 			path = yaktest;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314A6076253A2008F7A48 = {
+		DCC314A6076253A2008F7A48 /* example */ = {
+			isa = PBXGroup;
 			children = (
 			);
-			isa = PBXGroup;
 			path = example;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314A9076253A2008F7A48 = {
+		DCC314A9076253A2008F7A48 /* yaktest */ = {
+			isa = PBXGroup;
 			children = (
-				DCC314B7076253A2008F7A48,
-				DCC314B8076253A2008F7A48,
-				DCC314B9076253A2008F7A48,
-				DCC314BA076253A2008F7A48,
-				DCC314BB076253A2008F7A48,
-				DCC314BC076253A2008F7A48,
-				DCC314BD076253A2008F7A48,
-				DCC314BE076253A2008F7A48,
-				DCC314BF076253A2008F7A48,
-				DCC314C0076253A2008F7A48,
-				DCC314C1076253A2008F7A48,
-				DCC314CF076253A2008F7A48,
-				DCC314D0076253A2008F7A48,
-				DCC314D1076253A2008F7A48,
-				DCC314D2076253A2008F7A48,
-				DCC314D3076253A2008F7A48,
-				DCC314D4076253A2008F7A48,
-				DCC314D5076253A2008F7A48,
-				DCC314D6076253A2008F7A48,
-				DCC314D7076253A2008F7A48,
+				DCC314B7076253A2008F7A48 /* CMakeLists.txt */,
+				DCC314B8076253A2008F7A48 /* cStringable.hh */,
+				DCC314B9076253A2008F7A48 /* cTestCase.cc */,
+				DCC314BA076253A2008F7A48 /* cTestCase.hh */,
+				DCC314BB076253A2008F7A48 /* cTestProblem.cc */,
+				DCC314BC076253A2008F7A48 /* cTestProblem.hh */,
+				DCC314BD076253A2008F7A48 /* cTestResult.cc */,
+				DCC314BE076253A2008F7A48 /* cTestResult.hh */,
+				DCC314BF076253A2008F7A48 /* cTextTestInterpreter.cc */,
+				DCC314C0076253A2008F7A48 /* cTextTestInterpreter.hh */,
+				DCC314C1076253A2008F7A48 /* example */,
+				DCC314CF076253A2008F7A48 /* stringable.h */,
+				DCC314D0076253A2008F7A48 /* test_case.cpp */,
+				DCC314D1076253A2008F7A48 /* test_case.h */,
+				DCC314D2076253A2008F7A48 /* test_problem.cpp */,
+				DCC314D3076253A2008F7A48 /* test_problem.h */,
+				DCC314D4076253A2008F7A48 /* test_result.cpp */,
+				DCC314D5076253A2008F7A48 /* test_result.h */,
+				DCC314D6076253A2008F7A48 /* text_test_interpreter.cpp */,
+				DCC314D7076253A2008F7A48 /* text_test_interpreter.h */,
 			);
-			isa = PBXGroup;
 			path = yaktest;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314B7076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314B8076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cStringable.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314B9076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cTestCase.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BA076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cTestCase.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BB076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cTestProblem.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BC076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cTestProblem.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BD076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cTestResult.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BE076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cTestResult.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314BF076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cTextTestInterpreter.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314C0076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cTextTestInterpreter.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314C1076253A2008F7A48 = {
+		DCC314C1076253A2008F7A48 /* example */ = {
+			isa = PBXGroup;
 			children = (
-				DCC314CA076253A2008F7A48,
-				DCC314CB076253A2008F7A48,
-				DCC314CC076253A2008F7A48,
-				DCC314CD076253A2008F7A48,
+				DCC314CA076253A2008F7A48 /* point.h */,
+				DCC314CB076253A2008F7A48 /* test_case_point.cpp */,
+				DCC314CC076253A2008F7A48 /* test_case_point.h */,
+				DCC314CD076253A2008F7A48 /* test_point.cpp */,
 			);
-			isa = PBXGroup;
 			path = example;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC314CA076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = point.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314CB076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_case_point.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314CC076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = test_case_point.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314CD076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_point.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314CF076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = stringable.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D0076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_case.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D1076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = test_case.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D2076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_problem.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D3076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = test_problem.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D4076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = test_result.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D5076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = test_result.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D6076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = text_test_interpreter.cpp;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D7076253A2008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = text_test_interpreter.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC314D8076253A2008F7A48 = {
+		DCC314D8076253A2008F7A48 /* tools */ = {
+			isa = PBXGroup;
 			children = (
-				70CBFCEF0815E8370078D8CC,
-				70CBFCF00815E8370078D8CC,
-				DCC31545076253A4008F7A48,
-				DCC31546076253A4008F7A48,
-				DCC31547076253A4008F7A48,
-				DCC31548076253A4008F7A48,
-				DCC31549076253A4008F7A48,
-				DCC3154A076253A4008F7A48,
-				DCC3154B076253A4008F7A48,
-				DCC3154C076253A4008F7A48,
-				DCC3154D076253A4008F7A48,
-				DCC3154E076253A4008F7A48,
-				DCC3154F076253A4008F7A48,
-				DCC31550076253A4008F7A48,
-				DCC31551076253A4008F7A48,
-				DCC31552076253A4008F7A48,
-				DCC31553076253A4008F7A48,
-				DCC31554076253A4008F7A48,
-				DCC31555076253A4008F7A48,
-				DCC31556076253A4008F7A48,
-				DCC31557076253A4008F7A48,
-				DCC31558076253A4008F7A48,
-				DCC31559076253A4008F7A48,
-				DCC3155A076253A4008F7A48,
-				DCC3155B076253A4008F7A48,
-				DCC3155C076253A4008F7A48,
-				DCC3155D076253A4008F7A48,
-				DCC3155E076253A4008F7A48,
-				DCC3155F076253A4008F7A48,
-				DCC31560076253A4008F7A48,
-				DCC31561076253A4008F7A48,
-				DCC31562076253A4008F7A48,
-				DCC31563076253A4008F7A48,
-				DCC31564076253A4008F7A48,
-				DCC31565076253A4008F7A48,
-				DCC31566076253A4008F7A48,
-				DCC31567076253A4008F7A48,
-				DCC31568076253A4008F7A48,
-				DCC31569076253A4008F7A48,
-				DCC3156A076253A4008F7A48,
-				DCC3156B076253A4008F7A48,
-				DCC3156C076253A4008F7A48,
-				DCC3156D076253A4008F7A48,
-				DCC3156E076253A4008F7A48,
-				DCC3156F076253A4008F7A48,
-				DCC31570076253A4008F7A48,
-				DCC31571076253A4008F7A48,
-				DCC31572076253A4008F7A48,
-				DCC31573076253A4008F7A48,
-				DCC31574076253A4008F7A48,
-				DCC31575076253A4008F7A48,
-				DCC31576076253A4008F7A48,
-				DCC31577076253A4008F7A48,
-				DCC31579076253A4008F7A48,
-				DCC3157A076253A4008F7A48,
-				DCC3157B076253A4008F7A48,
-				DCC3157C076253A4008F7A48,
-				DCC3157D076253A4008F7A48,
-				DCC3157E076253A4008F7A48,
-				DCC3157F076253A4008F7A48,
-				DCC31580076253A4008F7A48,
-				DCC31581076253A4008F7A48,
-				DCC31582076253A4008F7A48,
-				DCC31583076253A4008F7A48,
-				DCC31584076253A4008F7A48,
-				DCC31585076253A4008F7A48,
-				DCC31586076253A4008F7A48,
-				DCC31587076253A4008F7A48,
-				DCC31588076253A4008F7A48,
-				DCC31589076253A4008F7A48,
-				DCC3158A076253A4008F7A48,
-				DCC3158B076253A4008F7A48,
-				DCC3158C076253A4008F7A48,
-				DCC3158D076253A4008F7A48,
-				DCC3158E076253A4008F7A48,
-				DCC3158F076253A4008F7A48,
-				DCC31590076253A4008F7A48,
-				DCC31591076253A4008F7A48,
-				DCC31592076253A4008F7A48,
-				DCC31593076253A4008F7A48,
-				DCC31594076253A4008F7A48,
-				DCC31595076253A4008F7A48,
-				DCC31596076253A4008F7A48,
-				DCC31597076253A4008F7A48,
-				DCC31598076253A4008F7A48,
-				DCC31599076253A4008F7A48,
-				DCC3159A076253A4008F7A48,
-				DCC3159B076253A4008F7A48,
-				DCC3159C076253A4008F7A48,
-				DCC3159D076253A4008F7A48,
-				DCC3159E076253A4008F7A48,
-				DCC3159F076253A4008F7A48,
-				DCC315A0076253A4008F7A48,
-				DCC315A7076253A4008F7A48,
-				DCC315A8076253A4008F7A48,
-				DCC315A9076253A4008F7A48,
-				DCC315AA076253A4008F7A48,
-				DCC315AB076253A4008F7A48,
-				DCC315AC076253A5008F7A48,
-				DCC315AD076253A5008F7A48,
-				DCC315AE076253A5008F7A48,
-				DCC315AF076253A5008F7A48,
-				DCC315B0076253A5008F7A48,
-				DCC315B1076253A5008F7A48,
-				DCC315B2076253A5008F7A48,
-				DCC315B3076253A5008F7A48,
-				DCC315B4076253A5008F7A48,
-				DCC315B5076253A5008F7A48,
+				70CBFCEF0815E8370078D8CC /* change_list.cc */,
+				70CBFCF00815E8370078D8CC /* change_list.hh */,
+				DCC31545076253A4008F7A48 /* block_struct.cc */,
+				DCC31546076253A4008F7A48 /* block_struct.hh */,
+				DCC31547076253A4008F7A48 /* cCycleCheck.cc */,
+				DCC31548076253A4008F7A48 /* cCycleCheck.hh */,
+				DCC31549076253A4008F7A48 /* cID.hh */,
+				DCC3154A076253A4008F7A48 /* CMakeLists.txt */,
+				DCC3154B076253A4008F7A48 /* const_schedule.cc */,
+				DCC3154C076253A4008F7A48 /* const_schedule.hh */,
+				DCC3154D076253A4008F7A48 /* count_tracker.cc */,
+				DCC3154E076253A4008F7A48 /* count_tracker.hh */,
+				DCC3154F076253A4008F7A48 /* cVerifierSuiteRecurser.hh */,
+				DCC31550076253A4008F7A48 /* data_entry.cc */,
+				DCC31551076253A4008F7A48 /* data_entry.hh */,
+				DCC31552076253A4008F7A48 /* data_file.cc */,
+				DCC31553076253A4008F7A48 /* data_file.hh */,
+				DCC31554076253A4008F7A48 /* data_file_manager.cc */,
+				DCC31555076253A4008F7A48 /* data_file_manager.hh */,
+				DCC31556076253A4008F7A48 /* data_manager_base.cc */,
+				DCC31557076253A4008F7A48 /* data_manager_base.hh */,
+				DCC31558076253A4008F7A48 /* default_message_display.cc */,
+				DCC31559076253A4008F7A48 /* default_message_display.hh */,
+				DCC3155A076253A4008F7A48 /* double_sum.cc */,
+				DCC3155B076253A4008F7A48 /* double_sum.hh */,
+				DCC3155C076253A4008F7A48 /* file.cc */,
+				DCC3155D076253A4008F7A48 /* file.hh */,
+				DCC3155E076253A4008F7A48 /* fixed_block.cc */,
+				DCC3155F076253A4008F7A48 /* fixed_block.hh */,
+				DCC31560076253A4008F7A48 /* fixed_coords.hh */,
+				DCC31561076253A4008F7A48 /* functions.hh */,
+				DCC31562076253A4008F7A48 /* genesis.cc */,
+				DCC31563076253A4008F7A48 /* genesis.hh */,
+				DCC31564076253A4008F7A48 /* help_alias.cc */,
+				DCC31565076253A4008F7A48 /* help_alias.hh */,
+				DCC31566076253A4008F7A48 /* help_entry.hh */,
+				DCC31567076253A4008F7A48 /* help_full_entry.hh */,
+				DCC31568076253A4008F7A48 /* help_manager.cc */,
+				DCC31569076253A4008F7A48 /* help_manager.hh */,
+				DCC3156A076253A4008F7A48 /* help_type.cc */,
+				DCC3156B076253A4008F7A48 /* help_type.hh */,
+				DCC3156C076253A4008F7A48 /* histogram.cc */,
+				DCC3156D076253A4008F7A48 /* histogram.hh */,
+				DCC3156E076253A4008F7A48 /* indexed_block_struct.cc */,
+				DCC3156F076253A4008F7A48 /* indexed_block_struct.hh */,
+				DCC31570076253A4008F7A48 /* init_file.cc */,
+				DCC31571076253A4008F7A48 /* init_file.hh */,
+				DCC31572076253A4008F7A48 /* int_sum.cc */,
+				DCC31573076253A4008F7A48 /* int_sum.hh */,
+				DCC31574076253A4008F7A48 /* integrated_schedule.cc */,
+				DCC31575076253A4008F7A48 /* integrated_schedule.hh */,
+				DCC31576076253A4008F7A48 /* integrated_schedule_node.cc */,
+				DCC31577076253A4008F7A48 /* integrated_schedule_node.hh */,
+				DCC31579076253A4008F7A48 /* merit.cc */,
+				DCC3157A076253A4008F7A48 /* merit.hh */,
+				DCC3157B076253A4008F7A48 /* message_class.hh */,
+				DCC3157C076253A4008F7A48 /* message_closure.hh */,
+				DCC3157D076253A4008F7A48 /* message_display.cc */,
+				DCC3157E076253A4008F7A48 /* message_display.hh */,
+				DCC3157F076253A4008F7A48 /* message_display_hdrs.hh */,
+				DCC31580076253A4008F7A48 /* message_type.hh */,
+				DCC31581076253A4008F7A48 /* prob_schedule.cc */,
+				DCC31582076253A4008F7A48 /* prob_schedule.hh */,
+				DCC31583076253A4008F7A48 /* random.cc */,
+				DCC31584076253A4008F7A48 /* random.hh */,
+				DCC31585076253A4008F7A48 /* recursive_tests_decl_hdrs.hh */,
+				DCC31586076253A4008F7A48 /* recursive_tests_defn_hdrs.hh */,
+				DCC31587076253A4008F7A48 /* recursive_tests_macros.hh */,
+				DCC31588076253A4008F7A48 /* ref_block.cc */,
+				DCC31589076253A4008F7A48 /* ref_block.hh */,
+				DCC3158A076253A4008F7A48 /* running_average.cc */,
+				DCC3158B076253A4008F7A48 /* running_average.hh */,
+				DCC3158C076253A4008F7A48 /* scaled_block.cc */,
+				DCC3158D076253A4008F7A48 /* scaled_block.hh */,
+				DCC3158E076253A4008F7A48 /* schedule.cc */,
+				DCC3158F076253A4008F7A48 /* schedule.hh */,
+				DCC31590076253A4008F7A48 /* string.cc */,
+				DCC31591076253A4008F7A48 /* string.hh */,
+				DCC31592076253A4008F7A48 /* string_iterator.cc */,
+				DCC31593076253A4008F7A48 /* string_iterator.hh */,
+				DCC31594076253A4008F7A48 /* string_list.cc */,
+				DCC31595076253A4008F7A48 /* string_list.hh */,
+				DCC31596076253A4008F7A48 /* string_util.cc */,
+				DCC31597076253A4008F7A48 /* string_util.hh */,
+				DCC31598076253A4008F7A48 /* tArgDataEntry.hh */,
+				DCC31599076253A4008F7A48 /* tArray.hh */,
+				DCC3159A076253A4008F7A48 /* tBuffer.hh */,
+				DCC3159B076253A4008F7A48 /* tDataEntry.hh */,
+				DCC3159C076253A4008F7A48 /* tDataEntryBase.hh */,
+				DCC3159D076253A4008F7A48 /* tDataEntryCommand.hh */,
+				DCC3159E076253A4008F7A48 /* tDataManager.hh */,
+				DCC3159F076253A4008F7A48 /* tDictionary.hh */,
+				DCC315A0076253A4008F7A48 /* tests */,
+				DCC315A7076253A4008F7A48 /* tList.hh */,
+				DCC315A8076253A4008F7A48 /* tMatrix.hh */,
+				DCC315A9076253A4008F7A48 /* tMemTrack.hh */,
+				DCC315AA076253A4008F7A48 /* tools.cc */,
+				DCC315AB076253A4008F7A48 /* tools.hh */,
+				DCC315AC076253A5008F7A48 /* tools.pri */,
+				DCC315AD076253A5008F7A48 /* tUnitTestSuite.hh */,
+				DCC315AE076253A5008F7A48 /* tUnitTestSuiteRecurser.hh */,
+				DCC315AF076253A5008F7A48 /* tVector.hh */,
+				DCC315B0076253A5008F7A48 /* tVerifierSuite.hh */,
+				DCC315B1076253A5008F7A48 /* tVerifierSuiteRecurser.hh */,
+				DCC315B2076253A5008F7A48 /* uint.hh */,
+				DCC315B3076253A5008F7A48 /* weighted_index.cc */,
+				DCC315B4076253A5008F7A48 /* weighted_index.hh */,
+				DCC315B5076253A5008F7A48 /* win32_mkdir_hack.hh */,
+				700E28CF0859FFD700CF158A /* tObjectFactory.h */,
 			);
-			isa = PBXGroup;
 			path = tools;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC31545076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = block_struct.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31546076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = block_struct.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31547076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = cCycleCheck.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31548076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cCycleCheck.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31549076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cID.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = const_schedule.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = const_schedule.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = count_tracker.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = count_tracker.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3154F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = cVerifierSuiteRecurser.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31550076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_entry.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31551076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = data_entry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31552076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_file.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31553076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = data_file.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31554076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_file_manager.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31555076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = data_file_manager.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31556076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = data_manager_base.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31557076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = data_manager_base.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31558076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = default_message_display.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31559076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = default_message_display.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = double_sum.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = double_sum.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = file.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = file.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = fixed_block.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3155F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = fixed_block.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31560076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = fixed_coords.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31561076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = functions.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31562076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = genesis.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31563076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = genesis.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31564076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_alias.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31565076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = help_alias.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31566076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = help_entry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31567076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = help_full_entry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31568076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_manager.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31569076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = help_manager.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = help_type.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = help_type.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = histogram.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = histogram.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = indexed_block_struct.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3156F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = indexed_block_struct.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31570076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = init_file.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31571076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = init_file.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31572076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = int_sum.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31573076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = int_sum.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31574076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = integrated_schedule.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31575076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = integrated_schedule.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31576076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = integrated_schedule_node.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31577076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = integrated_schedule_node.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31579076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = merit.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = merit.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = message_class.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = message_closure.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = message_display.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = message_display.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3157F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = message_display_hdrs.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31580076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = message_type.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31581076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = prob_schedule.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31582076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = prob_schedule.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31583076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = random.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31584076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = random.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31585076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = recursive_tests_decl_hdrs.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31586076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = recursive_tests_defn_hdrs.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31587076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = recursive_tests_macros.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31588076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = ref_block.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31589076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = ref_block.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = running_average.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = running_average.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = scaled_block.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = scaled_block.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = schedule.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3158F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = schedule.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31590076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31591076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = string.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31592076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_iterator.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31593076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = string_iterator.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31594076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_list.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31595076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = string_list.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31596076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = string_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31597076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = string_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31598076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tArgDataEntry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31599076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tArray.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159A076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tBuffer.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159B076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDataEntry.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159C076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDataEntryBase.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159D076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDataEntryCommand.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159E076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDataManager.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3159F076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tDictionary.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315A0076253A4008F7A48 = {
+		DCC315A0076253A4008F7A48 /* tests */ = {
+			isa = PBXGroup;
 			children = (
-				DCC315A5076253A4008F7A48,
-				DCC315A6076253A4008F7A48,
+				DCC315A5076253A4008F7A48 /* CMakeLists.txt */,
+				DCC315A6076253A4008F7A48 /* UnitTest_recursive_tests.cc */,
 			);
-			isa = PBXGroup;
 			path = tests;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC315A5076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315A6076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = UnitTest_recursive_tests.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315A7076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tList.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315A8076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tMatrix.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315A9076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tMemTrack.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AA076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = tools.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AB076253A4008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tools.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AC076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = tools.pri;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AD076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tUnitTestSuite.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AE076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tUnitTestSuiteRecurser.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315AF076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tVector.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B0076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tVerifierSuite.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B1076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = tVerifierSuiteRecurser.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B2076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = uint.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B3076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = weighted_index.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B4076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = weighted_index.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B5076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = win32_mkdir_hack.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315B6076253A5008F7A48 = {
+		DCC315B6076253A5008F7A48 /* utils */ = {
+			isa = PBXGroup;
 			children = (
-				DCC315BB076253A5008F7A48,
-				DCC315BC076253A5008F7A48,
-				DCC315C4076253A5008F7A48,
-				DCC315C5076253A5008F7A48,
+				DCC315BB076253A5008F7A48 /* fixHeaders.py */,
+				DCC315BC076253A5008F7A48 /* hist_map */,
+				DCC315C4076253A5008F7A48 /* matlabify.cc */,
+				DCC315C5076253A5008F7A48 /* task_events */,
 			);
-			isa = PBXGroup;
 			path = utils;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC315BB076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.python;
-			path = fixHeaders.py;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315BC076253A5008F7A48 = {
+		DCC315BC076253A5008F7A48 /* hist_map */ = {
+			isa = PBXGroup;
 			children = (
-				DCC315C1076253A5008F7A48,
-				DCC315C2076253A5008F7A48,
-				DCC315C3076253A5008F7A48,
+				DCC315C1076253A5008F7A48 /* hist_map.cc */,
+				DCC315C2076253A5008F7A48 /* hist_map2.cc */,
+				DCC315C3076253A5008F7A48 /* Makefile */,
 			);
-			isa = PBXGroup;
 			path = hist_map;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC315C1076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hist_map.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315C2076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hist_map2.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315C3076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.make;
-			path = Makefile;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315C4076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = matlabify.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315C5076253A5008F7A48 = {
+		DCC315C5076253A5008F7A48 /* task_events */ = {
+			isa = PBXGroup;
 			children = (
-				DCC315CD076253A5008F7A48,
-				DCC315CE076253A5008F7A48,
-				DCC315CF076253A5008F7A48,
-				DCC315D0076253A5008F7A48,
-				DCC315D1076253A5008F7A48,
+				DCC315CD076253A5008F7A48 /* CMakeLists.txt */,
+				DCC315CE076253A5008F7A48 /* environment.rotate */,
+				DCC315CF076253A5008F7A48 /* Makefile */,
+				DCC315D0076253A5008F7A48 /* task_event_gen.cc */,
+				DCC315D1076253A5008F7A48 /* task_event_gen.old.cc */,
 			);
-			isa = PBXGroup;
 			path = task_events;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC315CD076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315CE076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = environment.rotate;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315CF076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.make;
-			path = Makefile;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315D0076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_event_gen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315D1076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = task_event_gen.old.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315D2076253A5008F7A48 = {
+		DCC315D2076253A5008F7A48 /* viewers */ = {
+			isa = PBXGroup;
 			children = (
-				DCC315F6076253A5008F7A48,
-				DCC315F7076253A5008F7A48,
-				DCC315F8076253A5008F7A48,
-				DCC315F9076253A5008F7A48,
-				DCC315FA076253A5008F7A48,
-				DCC315FB076253A5008F7A48,
-				DCC315FC076253A5008F7A48,
-				DCC315FD076253A5008F7A48,
-				DCC315FE076253A5008F7A48,
-				DCC315FF076253A5008F7A48,
-				DCC31601076253A5008F7A48,
-				DCC31602076253A5008F7A48,
-				DCC31603076253A5008F7A48,
-				DCC31604076253A5008F7A48,
-				DCC31605076253A5008F7A48,
-				DCC31606076253A5008F7A48,
-				DCC31607076253A5008F7A48,
-				DCC31608076253A5008F7A48,
-				DCC31609076253A5008F7A48,
-				DCC3160A076253A5008F7A48,
-				DCC3160B076253A5008F7A48,
-				DCC3160C076253A5008F7A48,
-				DCC3160D076253A5008F7A48,
-				DCC3160E076253A5008F7A48,
-				DCC3160F076253A5008F7A48,
-				DCC31610076253A5008F7A48,
-				DCC31611076253A5008F7A48,
-				DCC31612076253A5008F7A48,
-				DCC31613076253A5008F7A48,
-				DCC31614076253A5008F7A48,
-				DCC31615076253A5008F7A48,
-				DCC31616076253A5008F7A48,
+				DCC315F6076253A5008F7A48 /* ansi.cc */,
+				DCC315F7076253A5008F7A48 /* ansi.hh */,
+				DCC315F8076253A5008F7A48 /* bar_screen.cc */,
+				DCC315F9076253A5008F7A48 /* bar_screen.hh */,
+				DCC315FA076253A5008F7A48 /* CMakeLists.txt */,
+				DCC315FB076253A5008F7A48 /* environment_screen.cc */,
+				DCC315FC076253A5008F7A48 /* environment_screen.hh */,
+				DCC315FD076253A5008F7A48 /* hist_screen.cc */,
+				DCC315FE076253A5008F7A48 /* hist_screen.hh */,
+				DCC315FF076253A5008F7A48 /* key_chart */,
+				DCC31601076253A5008F7A48 /* map_screen.cc */,
+				DCC31602076253A5008F7A48 /* map_screen.hh */,
+				DCC31603076253A5008F7A48 /* menu.cc */,
+				DCC31604076253A5008F7A48 /* menu.hh */,
+				DCC31605076253A5008F7A48 /* ncurses.cc */,
+				DCC31606076253A5008F7A48 /* ncurses.hh */,
+				DCC31607076253A5008F7A48 /* options_screen.cc */,
+				DCC31608076253A5008F7A48 /* options_screen.hh */,
+				DCC31609076253A5008F7A48 /* stats_screen.cc */,
+				DCC3160A076253A5008F7A48 /* stats_screen.hh */,
+				DCC3160B076253A5008F7A48 /* symbol_util.cc */,
+				DCC3160C076253A5008F7A48 /* symbol_util.hh */,
+				DCC3160D076253A5008F7A48 /* text_screen.cc */,
+				DCC3160E076253A5008F7A48 /* text_screen.hh */,
+				DCC3160F076253A5008F7A48 /* text_window.hh */,
+				DCC31610076253A5008F7A48 /* view.cc */,
+				DCC31611076253A5008F7A48 /* view.hh */,
+				DCC31612076253A5008F7A48 /* viewer.cc */,
+				DCC31613076253A5008F7A48 /* viewer.hh */,
+				DCC31614076253A5008F7A48 /* viewers.pro */,
+				DCC31615076253A5008F7A48 /* zoom_screen.cc */,
+				DCC31616076253A5008F7A48 /* zoom_screen.hh */,
 			);
-			isa = PBXGroup;
 			path = viewers;
-			refType = 4;
 			sourceTree = "<group>";
 		};
-		DCC315F6076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = ansi.cc;
-			refType = 4;
+		DCC3164E07626CF3008F7A48 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				DCC3164D07626CF3008F7A48 /* primitive */,
+			);
+			name = Products;
 			sourceTree = "<group>";
 		};
-		DCC315F7076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = ansi.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315F8076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = bar_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315F9076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = bar_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FA076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = CMakeLists.txt;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FB076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = environment_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FC076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = environment_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FD076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = hist_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FE076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = hist_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC315FF076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = key_chart;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31601076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = map_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31602076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = map_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31603076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = menu.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31604076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = menu.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31605076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = ncurses.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31606076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = ncurses.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31607076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = options_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31608076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = options_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31609076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = stats_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160A076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = stats_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160B076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = symbol_util.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160C076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = symbol_util.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160D076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = text_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160E076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = text_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3160F076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = text_window.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31610076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = view.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31611076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = view.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31612076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = viewer.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31613076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = viewer.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31614076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text;
-			path = viewers.pro;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31615076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.cpp;
-			path = zoom_screen.cc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC31616076253A5008F7A48 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.cpp.h;
-			path = zoom_screen.hh;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		DCC3164A07626CF3008F7A48 = {
-			buildActionMask = 2147483647;
-			files = (
-				DCC3165007626D40008F7A48,
-				DCC3165F0762852D008F7A48,
-				DCC316600762852F008F7A48,
-				DCC3166107628531008F7A48,
-				DCC3166207628532008F7A48,
-				DCC3166307628533008F7A48,
-				DCC3166407628534008F7A48,
-				DCC3166507628535008F7A48,
-				DCC3166607628536008F7A48,
-				DCC3166707628537008F7A48,
-				DCC3166807628538008F7A48,
-				DCC3166907628539008F7A48,
-				DCC3166A0762853A008F7A48,
-				DCC3166B0762853B008F7A48,
-				DCC3166C0762853D008F7A48,
-				DCC3166D0762853E008F7A48,
-				DCC3166E0762853F008F7A48,
-				DCC3166F07628559008F7A48,
-				DCC316700762855C008F7A48,
-				DCC316710762855D008F7A48,
-				DCC316720762855E008F7A48,
-				DCC316730762855F008F7A48,
-				DCC316740762855F008F7A48,
-				DCC3167507628560008F7A48,
-				DCC3167607628563008F7A48,
-				DCC3167707628565008F7A48,
-				DCC3167807628566008F7A48,
-				DCC3167907628567008F7A48,
-				DCC3167A07628567008F7A48,
-				DCC3167B07628568008F7A48,
-				DCC3167C07628569008F7A48,
-				DCC3167D07628569008F7A48,
-				DCC3167E0762856C008F7A48,
-				DCC3167F0762856C008F7A48,
-				DCC316800762856D008F7A48,
-				DCC316810762856E008F7A48,
-				DCC316820762856F008F7A48,
-				DCC3168307628570008F7A48,
-				DCC3168407628571008F7A48,
-				DCC3168507628572008F7A48,
-				DCC3168607628573008F7A48,
-				DCC3168707628574008F7A48,
-				DCC3168807628577008F7A48,
-				DCC3168907628578008F7A48,
-				DCC3168A0762857A008F7A48,
-				DCC3168B0762857A008F7A48,
-				DCC3168C0762857B008F7A48,
-				DCC3168D0762857C008F7A48,
-				DCC3168E0762857D008F7A48,
-				DCC3168F0762857F008F7A48,
-				DCC316900762857F008F7A48,
-				DCC3169107628580008F7A48,
-				DCC3169207628581008F7A48,
-				DCC3169307628582008F7A48,
-				DCC3169407628583008F7A48,
-				DCC3169507628584008F7A48,
-				DCC3169607628585008F7A48,
-				DCC3169707628585008F7A48,
-				DCC316980762858C008F7A48,
-				DCC316990762858D008F7A48,
-				DCC3169A0762858E008F7A48,
-				DCC3169B0762858F008F7A48,
-				DCC3169D076285C4008F7A48,
-				DCC3169E076285C5008F7A48,
-				DCC3169F076285C6008F7A48,
-				DCC316A0076285C7008F7A48,
-				DCC316A1076285C8008F7A48,
-				DCC316A2076285D1008F7A48,
-				DCC316A3076285D2008F7A48,
-				DCC316A5076285D5008F7A48,
-				DCC316A6076285D5008F7A48,
-				DCC316A7076285D6008F7A48,
-				DCC316A8076285D7008F7A48,
-				DCC316A9076285D8008F7A48,
-				DCC316AA076285D9008F7A48,
-				DCC316AB076285DA008F7A48,
-				DCC316AC076285DB008F7A48,
-				DCC316AD076285DC008F7A48,
-				DCC316AE076285DD008F7A48,
-				DCC316AF076285DF008F7A48,
-				DCC316B0076285DF008F7A48,
-				DCC316B1076285E0008F7A48,
-				DCC316B507628724008F7A48,
-				DCC316B607628726008F7A48,
-				DCC316B707628728008F7A48,
-				DCC316B807628742008F7A48,
-				DCC316B907628744008F7A48,
-				DCC316BA07628749008F7A48,
-				DCC316BB0762874A008F7A48,
-				DCC316BC0762874B008F7A48,
-				DCC316BD0762874C008F7A48,
-				DCC316BE0762874D008F7A48,
-				DCC316BF0762874E008F7A48,
-				DCC316C00762874F008F7A48,
-				DCC316C107628750008F7A48,
-				DCC316C207628751008F7A48,
-				DCC316C307628752008F7A48,
-				DCC316C407628753008F7A48,
-				DCC316C507628754008F7A48,
-				DCC316C607628755008F7A48,
-				DCC316C707628757008F7A48,
-				DCC316C807628758008F7A48,
-				DCC316C90762875A008F7A48,
-				DCC316CA0762875B008F7A48,
-				DCC316CB0762875C008F7A48,
-				DCC316CC0762875D008F7A48,
-				DCC316CD0762875D008F7A48,
-				DCC316CE0762875E008F7A48,
-				DCC316CF0762875F008F7A48,
-				DCC316D007628761008F7A48,
-				DCC316D107628763008F7A48,
-				DCC316D207628764008F7A48,
-				DCC316D307628765008F7A48,
-				DCC316D407628766008F7A48,
-				DCC316D507628767008F7A48,
-				DCC316D607628769008F7A48,
-				DCC316D70762876A008F7A48,
-				DCC316D80762876B008F7A48,
-				DCC316D90762876C008F7A48,
-				DCC316DA0762876E008F7A48,
-				DCC316DB0762876F008F7A48,
-				70CBFCEE0815E7FE0078D8CC,
-				70CBFCF10815E8370078D8CC,
-				706D3157085243CD00D7DC8F,
-				706D31650852475D00D7DC8F,
-				706D31660852475E00D7DC8F,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCC3164B07626CF3008F7A48 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		DCC3164C07626CF3008F7A48 = {
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		DCC3164C07626CF3008F7A48 /* primitive */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 702442D20859E0B00059BD9B /* Build configuration list for PBXNativeTarget "primitive" */;
 			buildPhases = (
-				DCBB56590763EA7F00FA9C7E,
-				DCC3164A07626CF3008F7A48,
-				DCC3164B07626CF3008F7A48,
-				70486B9508267145009328F0,
+				DCBB56590763EA7F00FA9C7E /* ShellScript */,
+				DCC3164A07626CF3008F7A48 /* Sources */,
+				DCC3164B07626CF3008F7A48 /* Frameworks */,
+				70486B9508267145009328F0 /* CopyFiles */,
 			);
 			buildRules = (
 			);
@@ -9651,760 +2837,355 @@
 				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
 				PRODUCT_NAME = primitive;
 				SKIP_INSTALL = YES;
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
 				ZERO_LINK = YES;
 			};
 			dependencies = (
 			);
-			isa = PBXNativeTarget;
 			name = primitive;
 			productName = primitive;
-			productReference = DCC3164D07626CF3008F7A48;
+			productReference = DCC3164D07626CF3008F7A48 /* primitive */;
 			productType = "com.apple.product-type.tool";
 		};
-		DCC3164D07626CF3008F7A48 = {
-			explicitFileType = "compiled.mach-o.executable";
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = primitive;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		DCC30C4D0762532C008F7A48 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */;
+			buildSettings = {
+			};
+			buildStyles = (
+				DCC30C4B0762532C008F7A48 /* Development */,
+				DCC30C4C0762532C008F7A48 /* Deployment */,
+				70486B8C08266CA2009328F0 /* Profile */,
+			);
+			hasScannedForEncodings = 0;
+			mainGroup = DCC30C490762532C008F7A48;
+			productRefGroup = DCC3164E07626CF3008F7A48 /* Products */;
+			projectDirPath = "";
+			targets = (
+				DCC3164C07626CF3008F7A48 /* primitive */,
+			);
 		};
-		DCC3164E07626CF3008F7A48 = {
-			children = (
-				DCC3164D07626CF3008F7A48,
+/* End PBXProject section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		DCBB56590763EA7F00FA9C7E /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			comments = "This is a hackish way to get the system to build the auto-generated code before compiling the rest of the system.";
+			files = (
 			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-			sourceTree = "<group>";
+			inputPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILES_DIR)/cPopulation_construct_event_auto.ci",
+				"$(DERIVED_FILES_DIR)/cPopulation_descr.ci",
+				"$(DERIVED_FILES_DIR)/cPopulation_descr.hi",
+				"$(DERIVED_FILES_DIR)/cPopulation_enums_auto.ci",
+				"$(DERIVED_FILES_DIR)/cPopulation_name2enum_auto.ci",
+				"$(DERIVED_FILES_DIR)/cPopulation_process_auto.ci",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "perl source/event/make_events.pl -x[source/event/cPopulation][$DERIVED_FILES_DIR]";
 		};
-		DCC3165007626D40008F7A48 = {
-			fileRef = DCC311090762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		DCC3164A07626CF3008F7A48 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				DCC3165007626D40008F7A48 /* primitive.cc in Sources */,
+				DCC3165F0762852D008F7A48 /* analyze_genotype.cc in Sources */,
+				DCC316600762852F008F7A48 /* analyze_util.cc in Sources */,
+				DCC3166107628531008F7A48 /* avida.cc in Sources */,
+				DCC3166207628532008F7A48 /* avida_driver_analyze.cc in Sources */,
+				DCC3166307628533008F7A48 /* avida_driver_base.cc in Sources */,
+				DCC3166407628534008F7A48 /* avida_driver_population.cc in Sources */,
+				DCC3166507628535008F7A48 /* birth_chamber.cc in Sources */,
+				DCC3166607628536008F7A48 /* callback_util.cc in Sources */,
+				DCC3166707628537008F7A48 /* config.cc in Sources */,
+				DCC3166807628538008F7A48 /* environment.cc in Sources */,
+				DCC3166907628539008F7A48 /* fitness_matrix.cc in Sources */,
+				DCC3166A0762853A008F7A48 /* genebank.cc in Sources */,
+				DCC3166B0762853B008F7A48 /* genome.cc in Sources */,
+				DCC3166C0762853D008F7A48 /* genome_util.cc in Sources */,
+				DCC3166D0762853E008F7A48 /* genotype.cc in Sources */,
+				DCC3166E0762853F008F7A48 /* genotype_birth_data.cc in Sources */,
+				DCC3166F07628559008F7A48 /* analyze.cc in Sources */,
+				DCC316700762855C008F7A48 /* genotype_control.cc in Sources */,
+				DCC316710762855D008F7A48 /* genotype_test_data.cc in Sources */,
+				DCC316720762855E008F7A48 /* inject_genebank.cc in Sources */,
+				DCC316730762855F008F7A48 /* inject_genotype.cc in Sources */,
+				DCC316740762855F008F7A48 /* inject_genotype_birth_data.cc in Sources */,
+				DCC3167507628560008F7A48 /* inject_genotype_control.cc in Sources */,
+				DCC3167607628563008F7A48 /* inject_genotype_queue.cc in Sources */,
+				DCC3167707628565008F7A48 /* inst_set.cc in Sources */,
+				DCC3167807628566008F7A48 /* inst_util.cc in Sources */,
+				DCC3167907628567008F7A48 /* instruction.cc in Sources */,
+				DCC3167A07628567008F7A48 /* landscape.cc in Sources */,
+				DCC3167B07628568008F7A48 /* lineage.cc in Sources */,
+				DCC3167C07628569008F7A48 /* lineage_control.cc in Sources */,
+				DCC3167D07628569008F7A48 /* local_mutations.cc in Sources */,
+				DCC3167E0762856C008F7A48 /* mutation.cc in Sources */,
+				DCC3167F0762856C008F7A48 /* mutation_lib.cc in Sources */,
+				DCC316800762856D008F7A48 /* mutation_rates.cc in Sources */,
+				DCC316810762856E008F7A48 /* mx_code_array.cc in Sources */,
+				DCC316820762856F008F7A48 /* org_message.cc in Sources */,
+				DCC3168307628570008F7A48 /* organism.cc in Sources */,
+				DCC3168407628571008F7A48 /* phenotype.cc in Sources */,
+				DCC3168507628572008F7A48 /* population.cc in Sources */,
+				DCC3168607628573008F7A48 /* population_interface.cc in Sources */,
+				DCC3168707628574008F7A48 /* population_cell.cc in Sources */,
+				DCC3168807628577008F7A48 /* reaction.cc in Sources */,
+				DCC3168907628578008F7A48 /* reaction_lib.cc in Sources */,
+				DCC3168A0762857A008F7A48 /* reaction_process.cc in Sources */,
+				DCC3168B0762857A008F7A48 /* reaction_requisite.cc in Sources */,
+				DCC3168C0762857B008F7A48 /* reaction_result.cc in Sources */,
+				DCC3168D0762857C008F7A48 /* resource.cc in Sources */,
+				DCC3168E0762857D008F7A48 /* resource_count.cc in Sources */,
+				DCC3168F0762857F008F7A48 /* resource_lib.cc in Sources */,
+				DCC316900762857F008F7A48 /* spatial_count_elem.cc in Sources */,
+				DCC3169107628580008F7A48 /* spatial_res_count.cc in Sources */,
+				DCC3169207628581008F7A48 /* species.cc in Sources */,
+				DCC3169307628582008F7A48 /* species_control.cc in Sources */,
+				DCC3169407628583008F7A48 /* species_queue.cc in Sources */,
+				DCC3169507628584008F7A48 /* stats.cc in Sources */,
+				DCC3169607628585008F7A48 /* task_entry.cc in Sources */,
+				DCC3169707628585008F7A48 /* task_lib.cc in Sources */,
+				DCC316980762858C008F7A48 /* event.cc in Sources */,
+				DCC316990762858D008F7A48 /* event_factory.cc in Sources */,
+				DCC3169A0762858E008F7A48 /* event_factory_manager.cc in Sources */,
+				DCC3169B0762858F008F7A48 /* event_list.cc in Sources */,
+				DCC3169D076285C4008F7A48 /* event_list_entry.cc in Sources */,
+				DCC3169E076285C5008F7A48 /* event_list_iterator.cc in Sources */,
+				DCC3169F076285C6008F7A48 /* event_triggers.cc in Sources */,
+				DCC316A1076285C8008F7A48 /* population_event_factory.cc in Sources */,
+				DCC316A2076285D1008F7A48 /* head_multi_mem.cc in Sources */,
+				DCC316A3076285D2008F7A48 /* code_label.cc in Sources */,
+				DCC316A5076285D5008F7A48 /* cpu_memory.cc in Sources */,
+				DCC316A6076285D5008F7A48 /* cpu_stack.cc in Sources */,
+				DCC316A7076285D6008F7A48 /* cpu_test_info.cc in Sources */,
+				DCC316A8076285D7008F7A48 /* hardware_4stack.cc in Sources */,
+				DCC316A9076285D8008F7A48 /* hardware_4stack_thread.cc in Sources */,
+				DCC316AA076285D9008F7A48 /* hardware_base.cc in Sources */,
+				DCC316AB076285DA008F7A48 /* hardware_cpu.cc in Sources */,
+				DCC316AC076285DB008F7A48 /* hardware_cpu_thread.cc in Sources */,
+				DCC316AD076285DC008F7A48 /* hardware_factory.cc in Sources */,
+				DCC316AE076285DD008F7A48 /* hardware_util.cc in Sources */,
+				DCC316AF076285DF008F7A48 /* memory_flags.cc in Sources */,
+				DCC316B0076285DF008F7A48 /* test_cpu.cc in Sources */,
+				DCC316B1076285E0008F7A48 /* test_util.cc in Sources */,
+				DCC316B507628724008F7A48 /* trio.c in Sources */,
+				DCC316B607628726008F7A48 /* trionan.c in Sources */,
+				DCC316B707628728008F7A48 /* triostr.c in Sources */,
+				DCC316B807628742008F7A48 /* weighted_index.cc in Sources */,
+				DCC316B907628744008F7A48 /* tools.cc in Sources */,
+				DCC316BA07628749008F7A48 /* block_struct.cc in Sources */,
+				DCC316BB0762874A008F7A48 /* cCycleCheck.cc in Sources */,
+				DCC316BC0762874B008F7A48 /* const_schedule.cc in Sources */,
+				DCC316BD0762874C008F7A48 /* count_tracker.cc in Sources */,
+				DCC316BE0762874D008F7A48 /* data_entry.cc in Sources */,
+				DCC316BF0762874E008F7A48 /* data_file.cc in Sources */,
+				DCC316C00762874F008F7A48 /* data_file_manager.cc in Sources */,
+				DCC316C107628750008F7A48 /* data_manager_base.cc in Sources */,
+				DCC316C207628751008F7A48 /* default_message_display.cc in Sources */,
+				DCC316C307628752008F7A48 /* double_sum.cc in Sources */,
+				DCC316C407628753008F7A48 /* file.cc in Sources */,
+				DCC316C507628754008F7A48 /* fixed_block.cc in Sources */,
+				DCC316C607628755008F7A48 /* genesis.cc in Sources */,
+				DCC316C707628757008F7A48 /* help_alias.cc in Sources */,
+				DCC316C807628758008F7A48 /* help_manager.cc in Sources */,
+				DCC316C90762875A008F7A48 /* help_type.cc in Sources */,
+				DCC316CA0762875B008F7A48 /* histogram.cc in Sources */,
+				DCC316CB0762875C008F7A48 /* indexed_block_struct.cc in Sources */,
+				DCC316CC0762875D008F7A48 /* init_file.cc in Sources */,
+				DCC316CD0762875D008F7A48 /* int_sum.cc in Sources */,
+				DCC316CE0762875E008F7A48 /* integrated_schedule.cc in Sources */,
+				DCC316CF0762875F008F7A48 /* integrated_schedule_node.cc in Sources */,
+				DCC316D007628761008F7A48 /* merit.cc in Sources */,
+				DCC316D107628763008F7A48 /* message_display.cc in Sources */,
+				DCC316D207628764008F7A48 /* prob_schedule.cc in Sources */,
+				DCC316D307628765008F7A48 /* random.cc in Sources */,
+				DCC316D407628766008F7A48 /* ref_block.cc in Sources */,
+				DCC316D507628767008F7A48 /* running_average.cc in Sources */,
+				DCC316D607628769008F7A48 /* scaled_block.cc in Sources */,
+				DCC316D70762876A008F7A48 /* schedule.cc in Sources */,
+				DCC316D80762876B008F7A48 /* string.cc in Sources */,
+				DCC316D90762876C008F7A48 /* string_iterator.cc in Sources */,
+				DCC316DA0762876E008F7A48 /* string_list.cc in Sources */,
+				DCC316DB0762876F008F7A48 /* string_util.cc in Sources */,
+				70CBFCEE0815E7FE0078D8CC /* hardware_status_printer.cc in Sources */,
+				70CBFCF10815E8370078D8CC /* change_list.cc in Sources */,
+				706D3157085243CD00D7DC8F /* head_cpu.cc in Sources */,
+				706D31650852475D00D7DC8F /* hardware_smt_thread.cc in Sources */,
+				706D31660852475E00D7DC8F /* hardware_smt.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
 		};
-		DCC3165F0762852D008F7A48 = {
-			fileRef = DCC310980762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		702442D30859E0B00059BD9B /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ALTIVEC_EXTENSIONS = YES;
+				GCC_AUTO_VECTORIZATION = YES;
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_FAST_MATH = YES;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_UNROLL_LOOPS = YES;
+				HEADER_SEARCH_PATHS = source/event/;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
+				PRODUCT_NAME = primitive;
+				SKIP_INSTALL = YES;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = YES;
 			};
+			name = Development;
 		};
-		DCC316600762852F008F7A48 = {
-			fileRef = DCC3109A0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442D40859E0B00059BD9B /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEAD_CODE_STRIPPING = YES;
+				GCC_ALTIVEC_EXTENSIONS = YES;
+				GCC_AUTO_VECTORIZATION = YES;
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_FAST_MATH = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_UNROLL_LOOPS = YES;
+				HEADER_SEARCH_PATHS = source/event/;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
+				PRODUCT_NAME = primitive;
+				SKIP_INSTALL = YES;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = NO;
 			};
+			name = Deployment;
 		};
-		DCC3166107628531008F7A48 = {
-			fileRef = DCC3109C0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442D50859E0B00059BD9B /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ALTIVEC_EXTENSIONS = YES;
+				GCC_AUTO_VECTORIZATION = YES;
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_FAST_MATH = YES;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_UNROLL_LOOPS = YES;
+				HEADER_SEARCH_PATHS = source/event/;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
+				PRODUCT_NAME = primitive;
+				SKIP_INSTALL = YES;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = YES;
 			};
+			name = Profile;
 		};
-		DCC3166207628532008F7A48 = {
-			fileRef = DCC3109E0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442D60859E0B00059BD9B /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				GCC_ALTIVEC_EXTENSIONS = YES;
+				GCC_AUTO_VECTORIZATION = YES;
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_FAST_MATH = YES;
+				GCC_MODEL_CPU = G4;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = "";
+				GCC_UNROLL_LOOPS = YES;
+				HEADER_SEARCH_PATHS = source/event/;
+				INSTALL_PATH = "$(BUILT_PRODUCTS_DIR)/work";
+				PRODUCT_NAME = primitive;
+				SKIP_INSTALL = YES;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				ZERO_LINK = YES;
 			};
+			name = Default;
 		};
-		DCC3166307628533008F7A48 = {
-			fileRef = DCC310A00762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442D80859E0B00059BD9B /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
 			};
+			name = Development;
 		};
-		DCC3166407628534008F7A48 = {
-			fileRef = DCC310A20762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442D90859E0B00059BD9B /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
 			};
+			name = Deployment;
 		};
-		DCC3166507628535008F7A48 = {
-			fileRef = DCC310A50762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442DA0859E0B00059BD9B /* Profile */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
 			};
+			name = Profile;
 		};
-		DCC3166607628536008F7A48 = {
-			fileRef = DCC310A70762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
+		702442DB0859E0B00059BD9B /* Default */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
 			};
+			name = Default;
 		};
-		DCC3166707628537008F7A48 = {
-			fileRef = DCC310AA0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		702442D20859E0B00059BD9B /* Build configuration list for PBXNativeTarget "primitive" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				702442D30859E0B00059BD9B /* Development */,
+				702442D40859E0B00059BD9B /* Deployment */,
+				702442D50859E0B00059BD9B /* Profile */,
+				702442D60859E0B00059BD9B /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
-		DCC3166807628538008F7A48 = {
-			fileRef = DCC310AC0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
+		702442D70859E0B00059BD9B /* Build configuration list for PBXProject "Avida2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				702442D80859E0B00059BD9B /* Development */,
+				702442D90859E0B00059BD9B /* Deployment */,
+				702442DA0859E0B00059BD9B /* Profile */,
+				702442DB0859E0B00059BD9B /* Default */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
-		DCC3166907628539008F7A48 = {
-			fileRef = DCC310AE0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166A0762853A008F7A48 = {
-			fileRef = DCC310C50762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166B0762853B008F7A48 = {
-			fileRef = DCC310C70762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166C0762853D008F7A48 = {
-			fileRef = DCC310C90762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166D0762853E008F7A48 = {
-			fileRef = DCC310CB0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166E0762853F008F7A48 = {
-			fileRef = DCC310CE0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3166F07628559008F7A48 = {
-			fileRef = DCC310900762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316700762855C008F7A48 = {
-			fileRef = DCC310D00762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316710762855D008F7A48 = {
-			fileRef = DCC310D30762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316720762855E008F7A48 = {
-			fileRef = DCC310D50762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316730762855F008F7A48 = {
-			fileRef = DCC310D80762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316740762855F008F7A48 = {
-			fileRef = DCC310DA0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167507628560008F7A48 = {
-			fileRef = DCC310DC0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167607628563008F7A48 = {
-			fileRef = DCC310DF0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167707628565008F7A48 = {
-			fileRef = DCC310E20762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167807628566008F7A48 = {
-			fileRef = DCC310E40762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167907628567008F7A48 = {
-			fileRef = DCC310E60762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167A07628567008F7A48 = {
-			fileRef = DCC310E80762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167B07628568008F7A48 = {
-			fileRef = DCC310EA0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167C07628569008F7A48 = {
-			fileRef = DCC310EC0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167D07628569008F7A48 = {
-			fileRef = DCC310EE0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167E0762856C008F7A48 = {
-			fileRef = DCC310F30762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3167F0762856C008F7A48 = {
-			fileRef = DCC310F50762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316800762856D008F7A48 = {
-			fileRef = DCC310F80762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316810762856E008F7A48 = {
-			fileRef = DCC310FA0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316820762856F008F7A48 = {
-			fileRef = DCC310FD0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168307628570008F7A48 = {
-			fileRef = DCC310FF0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168407628571008F7A48 = {
-			fileRef = DCC311010762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168507628572008F7A48 = {
-			fileRef = DCC311030762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168607628573008F7A48 = {
-			fileRef = DCC311070762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168707628574008F7A48 = {
-			fileRef = DCC311050762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168807628577008F7A48 = {
-			fileRef = DCC3110B0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168907628578008F7A48 = {
-			fileRef = DCC3110D0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168A0762857A008F7A48 = {
-			fileRef = DCC311100762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168B0762857A008F7A48 = {
-			fileRef = DCC311120762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168C0762857B008F7A48 = {
-			fileRef = DCC311140762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168D0762857C008F7A48 = {
-			fileRef = DCC311160762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168E0762857D008F7A48 = {
-			fileRef = DCC311180762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3168F0762857F008F7A48 = {
-			fileRef = DCC3111B0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316900762857F008F7A48 = {
-			fileRef = DCC3111E0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169107628580008F7A48 = {
-			fileRef = DCC311200762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169207628581008F7A48 = {
-			fileRef = DCC311220762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169307628582008F7A48 = {
-			fileRef = DCC311240762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169407628583008F7A48 = {
-			fileRef = DCC311260762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169507628584008F7A48 = {
-			fileRef = DCC311280762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169607628585008F7A48 = {
-			fileRef = DCC3112A0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169707628585008F7A48 = {
-			fileRef = DCC3112C0762539E008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316980762858C008F7A48 = {
-			fileRef = DCC30FEE0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316990762858D008F7A48 = {
-			fileRef = DCC30FF10762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169A0762858E008F7A48 = {
-			fileRef = DCC30FF30762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169B0762858F008F7A48 = {
-			fileRef = DCC30FF50762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169D076285C4008F7A48 = {
-			fileRef = DCC30FF70762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169E076285C5008F7A48 = {
-			fileRef = DCC30FF90762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC3169F076285C6008F7A48 = {
-			fileRef = DCC30FFB0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A0076285C7008F7A48 = {
-			fileRef = DCC30FFF0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A1076285C8008F7A48 = {
-			fileRef = DCC310010762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A2076285D1008F7A48 = {
-			fileRef = DCC30FA70762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A3076285D2008F7A48 = {
-			fileRef = DCC30FAA0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A5076285D5008F7A48 = {
-			fileRef = DCC30FB00762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A6076285D5008F7A48 = {
-			fileRef = DCC30FB20762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A7076285D6008F7A48 = {
-			fileRef = DCC30FB50762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A8076285D7008F7A48 = {
-			fileRef = DCC30FB70762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316A9076285D8008F7A48 = {
-			fileRef = DCC30FBA0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AA076285D9008F7A48 = {
-			fileRef = DCC30FBC0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AB076285DA008F7A48 = {
-			fileRef = DCC30FBE0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AC076285DB008F7A48 = {
-			fileRef = DCC30FC00762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AD076285DC008F7A48 = {
-			fileRef = DCC30FC20762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AE076285DD008F7A48 = {
-			fileRef = DCC30FC40762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316AF076285DF008F7A48 = {
-			fileRef = DCC30FC80762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B0076285DF008F7A48 = {
-			fileRef = DCC30FCA0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B1076285E0008F7A48 = {
-			fileRef = DCC30FCC0762539D008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B507628724008F7A48 = {
-			fileRef = DCC3146D076253A1008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B607628726008F7A48 = {
-			fileRef = DCC31471076253A1008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B707628728008F7A48 = {
-			fileRef = DCC31474076253A1008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B807628742008F7A48 = {
-			fileRef = DCC315B3076253A5008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316B907628744008F7A48 = {
-			fileRef = DCC315AA076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BA07628749008F7A48 = {
-			fileRef = DCC31545076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BB0762874A008F7A48 = {
-			fileRef = DCC31547076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BC0762874B008F7A48 = {
-			fileRef = DCC3154B076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BD0762874C008F7A48 = {
-			fileRef = DCC3154D076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BE0762874D008F7A48 = {
-			fileRef = DCC31550076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316BF0762874E008F7A48 = {
-			fileRef = DCC31552076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C00762874F008F7A48 = {
-			fileRef = DCC31554076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C107628750008F7A48 = {
-			fileRef = DCC31556076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C207628751008F7A48 = {
-			fileRef = DCC31558076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C307628752008F7A48 = {
-			fileRef = DCC3155A076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C407628753008F7A48 = {
-			fileRef = DCC3155C076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C507628754008F7A48 = {
-			fileRef = DCC3155E076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C607628755008F7A48 = {
-			fileRef = DCC31562076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C707628757008F7A48 = {
-			fileRef = DCC31564076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C807628758008F7A48 = {
-			fileRef = DCC31568076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316C90762875A008F7A48 = {
-			fileRef = DCC3156A076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CA0762875B008F7A48 = {
-			fileRef = DCC3156C076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CB0762875C008F7A48 = {
-			fileRef = DCC3156E076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CC0762875D008F7A48 = {
-			fileRef = DCC31570076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CD0762875D008F7A48 = {
-			fileRef = DCC31572076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CE0762875E008F7A48 = {
-			fileRef = DCC31574076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316CF0762875F008F7A48 = {
-			fileRef = DCC31576076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D007628761008F7A48 = {
-			fileRef = DCC31579076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D107628763008F7A48 = {
-			fileRef = DCC3157D076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D207628764008F7A48 = {
-			fileRef = DCC31581076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D307628765008F7A48 = {
-			fileRef = DCC31583076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D407628766008F7A48 = {
-			fileRef = DCC31588076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D507628767008F7A48 = {
-			fileRef = DCC3158A076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D607628769008F7A48 = {
-			fileRef = DCC3158C076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D70762876A008F7A48 = {
-			fileRef = DCC3158E076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D80762876B008F7A48 = {
-			fileRef = DCC31590076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316D90762876C008F7A48 = {
-			fileRef = DCC31592076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316DA0762876E008F7A48 = {
-			fileRef = DCC31594076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		DCC316DB0762876F008F7A48 = {
-			fileRef = DCC31596076253A4008F7A48;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
+/* End XCConfigurationList section */
 	};
-	rootObject = DCC30C4D0762532C008F7A48;
+	rootObject = DCC30C4D0762532C008F7A48 /* Project object */;
 }

Modified: branches/brysonda/source/event/event_factory.cc
===================================================================
--- branches/brysonda/source/event/event_factory.cc	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/event_factory.cc	2005-06-10 19:24:15 UTC (rev 201)
@@ -13,16 +13,4 @@
 
 //////// cEventFactory ////////////
 
-cEventFactory::cEventFactory() : m_factory_id( 0 )
-{
-}
 
-
-cEventFactory::~cEventFactory()
-{
-}
-
-
-
-
-

Modified: branches/brysonda/source/event/event_factory.hh
===================================================================
--- branches/brysonda/source/event/event_factory.hh	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/event_factory.hh	2005-06-10 19:24:15 UTC (rev 201)
@@ -26,15 +26,12 @@
   cEventFactory& operator=( const cEventFactory& );
 
 public:
-  cEventFactory();
-  virtual ~cEventFactory();
+  cEventFactory() : m_factory_id(0) { ; }
+  virtual ~cEventFactory() { ; }
 
-  void SetFactoryId( int id ){
-    m_factory_id = id; }
+  void SetFactoryId(int id) { m_factory_id = id; }
+  int GetFactoryId() { return m_factory_id; }
 
-  int GetFactoryId(){
-    return m_factory_id; }
-
   /**
    * Returns an id for an event name. The id holds only for this factory,
    * a second factory might use the same id for something else.

Modified: branches/brysonda/source/event/event_factory_manager.cc
===================================================================
--- branches/brysonda/source/event/event_factory_manager.cc	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/event_factory_manager.cc	2005-06-10 19:24:15 UTC (rev 201)
@@ -26,8 +26,8 @@
 }
 
 cEventFactoryManager::~cEventFactoryManager(){
-  vector<cEventFactory*>::iterator it = m_factory_list.begin();
-
+  vector<tObjectFactory<cEvent, const cString&>*>::iterator it = m_factory_list.begin();
+  
   for( ; it != m_factory_list.end(); it++ )
     delete *it;
 }
@@ -35,19 +35,19 @@
 
 cEvent*
 cEventFactoryManager::ConstructEvent(const cString name,
-			      const cString & args,
-			      int factory_id){
+                                     const cString & args,
+                                     int factory_id){
   cEvent* event = NULL;
-
+  
   // factory_id < 0 => send to all factories
   if( factory_id < 0 ){
-    vector<cEventFactory*>::iterator it;
+    vector<tObjectFactory<cEvent, const cString&>*>::iterator it;
     for( it = m_factory_list.begin(); it != m_factory_list.end(); it++ ){
       if( *it != NULL )
-	event = (*it)->ConstructEvent(name,args);
+        event = (*it)->Create(name,args);
       if ( event != NULL ) // if we have found one factory that can create the
-	//                    event we want we stop.
-	break;
+                           //                    event we want we stop.
+        break;
     }
   }
   else{
@@ -55,21 +55,21 @@
     if ( factory_id >= static_cast<int>( m_factory_list.size() ) )
       return NULL;
     if( m_factory_list[factory_id] != NULL )
-      event = m_factory_list[factory_id]->ConstructEvent(name,args);
+      event = m_factory_list[factory_id]->Create(name,args);
   }
   return event;
 }
 
 
 int
-cEventFactoryManager::AddFactory( cEventFactory *factory )
+cEventFactoryManager::AddFactory(tObjectFactory<cEvent, const cString&>* factory)
 {
   assert( factory != NULL );
-  m_factory_list.push_back( factory );
-
+  m_factory_list.push_back(factory);
+  
   int id = m_factory_list.size();
-  factory->SetFactoryId( id );
-
+  factory->SetFactoryId(id);
+  
   return id;
 }
 

Modified: branches/brysonda/source/event/event_factory_manager.hh
===================================================================
--- branches/brysonda/source/event/event_factory_manager.hh	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/event_factory_manager.hh	2005-06-10 19:24:15 UTC (rev 201)
@@ -10,6 +10,10 @@
 
 #include <vector>
 
+#ifndef TOBJECTFACTORY_H
+#include "tObjectFactory.h"
+#endif
+
 #ifndef STRING_HH
 #include "string.hh"
 #endif
@@ -27,9 +31,8 @@
 
 class cEventFactoryManager {
 private:
-  std::vector<cEventFactory*> m_factory_list;
+  std::vector<tObjectFactory<cEvent, const cString&>*> m_factory_list;
 
-
   // not implemented, prevents inadvertent wrong instantiation
   cEventFactoryManager( const cEventFactoryManager & );
   cEventFactoryManager& operator=( const cEventFactoryManager& );
@@ -37,7 +40,7 @@
   cEventFactoryManager();
   ~cEventFactoryManager();
 
-  int AddFactory(cEventFactory* factory);
+  int AddFactory(tObjectFactory<cEvent, const cString&>* factory);
 
   /**
    * This function is used to construct an event. It sends the event's name

Modified: branches/brysonda/source/event/event_list.cc
===================================================================
--- branches/brysonda/source/event/event_list.cc	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/event_list.cc	2005-06-10 19:24:15 UTC (rev 201)
@@ -39,19 +39,19 @@
 //  cEventList
 /////////////////
 cEventList::cEventList( cEventFactoryManager* factory_manager,  cEventTriggers *triggers ) :
-  m_factory_manager( factory_manager ),
-  m_triggers( triggers ),
-  m_head(NULL),
-  m_tail(NULL),
-  m_current(NULL),
-  m_num_events(0)
+m_factory_manager( factory_manager ),
+m_triggers( triggers ),
+m_head(NULL),
+m_tail(NULL),
+m_current(NULL),
+m_num_events(0)
 {
 }
 
 cEventList::~cEventList() {
   /*
-  XXX:  modified by kaben.  DeleteAll is equivalent.
-  */
+   XXX:  modified by kaben.  DeleteAll is equivalent.
+   */
   //while( m_head != NULL ){
   //  m_current = m_head;
   //  m_head = m_head->GetNext();
@@ -59,17 +59,17 @@
   //}
   DeleteAll();
 
-  delete m_factory_manager;
-  delete m_triggers;
+delete m_factory_manager;
+delete m_triggers;
 }
 
 bool
 cEventList::AddEvent( cEventTriggers::eTriggerVariable trigger,
-			   double start, double interval, double stop,
-			   const cString & name, const cString & args ){
+                      double start, double interval, double stop,
+                      const cString & name, const cString & args ){
   assert( m_factory_manager != NULL );
   cEvent *event = m_factory_manager->ConstructEvent( name, args );
-
+  
   ///// Adding Event to the list /////
   if( event != NULL ){
     InsertEvent(event, trigger, start, interval, stop);
@@ -80,11 +80,11 @@
 
 
 void cEventList::InsertEvent(cEvent *event,
-			     cEventTriggers::eTriggerVariable trigger,
-			     double start, double interval, double stop){
+                             cEventTriggers::eTriggerVariable trigger,
+                             double start, double interval, double stop){
   assert( event != NULL );
   cEventListEntry *entry = new cEventListEntry(event, trigger,
-						start, interval, stop);
+                                               start, interval, stop);
   // If there are no events in the list yet.
   if( m_tail == NULL ){
     assert( m_head == NULL );
@@ -104,7 +104,7 @@
 
 void cEventList::Delete(cEventListEntry *entry){
   assert( entry != NULL );
-
+  
   if( entry->GetPrev() != NULL ){
     entry->GetPrev()->SetNext( entry->GetNext() );
   }
@@ -119,22 +119,22 @@
     assert( entry == m_tail );
     m_tail = entry->GetPrev();
   }
-
+  
   delete entry;
 }
 
 
 /*
-public manipulator used while rebuilding event list.
-XXX:  added by kaben.
-*/
+ public manipulator used while rebuilding event list.
+ XXX:  added by kaben.
+ */
 void cEventList::DeleteAll(void){
   while( m_head != NULL ){
     m_current = m_head;
     m_head = m_head->GetNext();
     delete m_head;
   }
-
+  
   m_head = 0;
   m_tail = 0;
   m_current = 0;
@@ -144,63 +144,63 @@
 
 void cEventList::Process(){
   double t_val = 0; // trigger value
-
+  
   // Iterate through all entrys in event list
   cEventListEntry * entry = m_head;
   while( entry != NULL ){
-
+    
     cEventListEntry * next_entry = entry->GetNext();
-
+    
     // Check trigger condition
-
+    
     // IMMEDIATE Events always happen and are always deleted
     if( entry->GetTrigger() == cEventTriggers::IMMEDIATE  ){
       //cerr<<"IMMEDIATE EVENT "<<event->GetName()<<endl;
       entry->GetEvent()->Process();
       Delete(entry);
     }else{
-
+      
       // Get the value of the appropriate trigger variable
       t_val = m_triggers->GetTriggerValue(entry->GetTrigger());
-
+      
       if( t_val != DBL_MAX &&
-	  ( t_val >= entry->GetStart() ||
-	    entry->GetStart() == cEventTriggers::TRIGGER_BEGIN ) &&
-	  ( t_val <= entry->GetStop() ||
-	    entry->GetStop() == cEventTriggers::TRIGGER_END ) ){
-	
-	entry->GetEvent()->Process();
-	
-	if( entry == NULL ){ // It is possible for an event to kill itself
-	}else{	
-	  // Handle the interval thing
-	  if( entry->GetInterval() == cEventTriggers::TRIGGER_ALL ){
-	    // Do Nothing
-	  }else if( entry->GetInterval() == cEventTriggers::TRIGGER_ONCE ){
-	    // If it is a onetime thing, remove it...
-	    Delete(entry);
-	  }else{
-	    // There is an interal.. so add it
-	    entry->NextInterval();
-	  }
-
-	  // If the event can never happen now... excize it
-	  if( entry != NULL  &&  entry->GetStop() != cEventTriggers::TRIGGER_END ){
-	    if( entry->GetStart() > entry->GetStop() &&
-		entry->GetInterval() > 0 ){
-	      Delete(entry);
-	    }else if( entry->GetStart() < entry->GetStop() &&
-		      entry->GetInterval() < 0 ){
-	      Delete(entry);
-	    }
-	  }
-	
-	}
-	
+          ( t_val >= entry->GetStart() ||
+            entry->GetStart() == cEventTriggers::TRIGGER_BEGIN ) &&
+          ( t_val <= entry->GetStop() ||
+            entry->GetStop() == cEventTriggers::TRIGGER_END ) ){
+        
+        entry->GetEvent()->Process();
+        
+        if( entry == NULL ){ // It is possible for an event to kill itself
+        }else{	
+          // Handle the interval thing
+          if( entry->GetInterval() == cEventTriggers::TRIGGER_ALL ){
+            // Do Nothing
+          }else if( entry->GetInterval() == cEventTriggers::TRIGGER_ONCE ){
+            // If it is a onetime thing, remove it...
+            Delete(entry);
+          }else{
+            // There is an interal.. so add it
+            entry->NextInterval();
+          }
+          
+          // If the event can never happen now... excize it
+          if( entry != NULL  &&  entry->GetStop() != cEventTriggers::TRIGGER_END ){
+            if( entry->GetStart() > entry->GetStop() &&
+                entry->GetInterval() > 0 ){
+              Delete(entry);
+            }else if( entry->GetStart() < entry->GetStop() &&
+                      entry->GetInterval() < 0 ){
+              Delete(entry);
+            }
+          }
+          
+        }
+        
       } // End Non-IMMEDITAE events
-
+      
     }  // end condition to do event
-
+    
     entry = next_entry;
   }
 }
@@ -221,29 +221,29 @@
 void cEventList::SyncEvent(cEventListEntry *entry){
   // Ignore events that are immdeiate
   if( entry->GetTrigger() == cEventTriggers::IMMEDIATE ){ return; }
-
+  
   double t_val = m_triggers->GetTriggerValue( entry->GetTrigger() );
-
+  
   // If t_val has past the end, remove (even if it is TRIGGER_ALL)
   if( t_val > entry->GetStop() ){
     Delete(entry);
     return;
   }
-
+  
   // If it is a trigger once and has passed, remove
   if( t_val > entry->GetStart() && entry->GetInterval() == cEventTriggers::TRIGGER_ONCE ){
     Delete(entry);
     return;
   }
-
+  
   // If for some reason t_val has been reset or soemthing, rewind
   if( t_val + entry->GetInterval() <= entry->GetStart() ){
     entry->Reset();
   }
-
+  
   // Can't fast forward events that are Triger All
   if( entry->GetInterval() == cEventTriggers::TRIGGER_ALL ){ return; }
-
+  
   // Keep adding interval to start until we are caught up
   while( t_val > entry->GetStart() ){
     entry->NextInterval();
@@ -262,11 +262,11 @@
 }
 
 /*
-XXX:  modified by kaben to stream-dump in parseable format.
-*/
+ XXX:  modified by kaben to stream-dump in parseable format.
+ */
 void cEventList::PrintEvent(cEventListEntry * entry, ostream & os){
-    assert( entry != NULL );
-    switch ( entry->GetTrigger() ){
+  assert( entry != NULL );
+  switch ( entry->GetTrigger() ){
     case cEventTriggers::UPDATE:
       //os<<"UPDATE ";
       os<<"update ";
@@ -282,52 +282,52 @@
     default:
       //os<<"UNDEFINED ";
       os<<"undefined ";
+  }
+  //os<<"[";
+  if (entry->GetTrigger() != cEventTriggers::IMMEDIATE ){
+    if( entry->GetStart() == cEventTriggers::TRIGGER_BEGIN ){
+      os<<"begin";
+    }else{
+      os<<entry->GetStart();
     }
-    //os<<"[";
-    if (entry->GetTrigger() != cEventTriggers::IMMEDIATE ){
-      if( entry->GetStart() == cEventTriggers::TRIGGER_BEGIN ){
-        os<<"begin";
-      }else{
-        os<<entry->GetStart();
-      }
-      os<<":";
-      if( entry->GetInterval() == cEventTriggers::TRIGGER_ONCE ){
-        os<<"once";
-      }else if( entry->GetInterval() == cEventTriggers::TRIGGER_ALL ){
-        os<<"all";
-      }else{
-        os<<entry->GetInterval();
-      }
-      os<<":";
-      if( entry->GetStop() == cEventTriggers::TRIGGER_END ){
-        os<<"end";
-      }else{
-        os<<entry->GetStop();
-      }
-      os<<" ";
+    os<<":";
+    if( entry->GetInterval() == cEventTriggers::TRIGGER_ONCE ){
+      os<<"once";
+    }else if( entry->GetInterval() == cEventTriggers::TRIGGER_ALL ){
+      os<<"all";
+    }else{
+      os<<entry->GetInterval();
     }
-    //os<<"] "<<entry->GetName()<<" "<<entry->GetArgs()<<endl;
-    os<<entry->GetName()<<" "<<entry->GetArgs()<<endl;
+    os<<":";
+    if( entry->GetStop() == cEventTriggers::TRIGGER_END ){
+      os<<"end";
+    }else{
+      os<<entry->GetStop();
+    }
+    os<<" ";
+  }
+  //os<<"] "<<entry->GetName()<<" "<<entry->GetArgs()<<endl;
+  os<<entry->GetName()<<" "<<entry->GetArgs()<<endl;
 }
 
 
 //// Parsing Event List File Format ////
 bool cEventList::AddEventFileFormat(const cString & in_line){
   cString cur_line = in_line;
-
+  
   // Timing
   cEventTriggers::eTriggerVariable trigger = cEventTriggers::UPDATE;
   double start = cEventTriggers::TRIGGER_BEGIN;
   double interval = cEventTriggers::TRIGGER_ONCE;
   double stop = cEventTriggers::TRIGGER_END;
-
+  
   cString name;
   cString arg_list;
-
+  
   cString tmp;
-
+  
   cString cur_word = cur_line.PopWord();
-
+  
   // Get the trigger variable if there
   if( cur_word == "i"  ||
       cur_word == "immediate" ){
@@ -335,35 +335,35 @@
     name = cur_line.PopWord();
     return AddEvent(name, cur_line); // If event is IMMEDIATE shortcut
   }else if( cur_word == "u"  ||
-	    cur_word == "update" ){
+            cur_word == "update" ){
     trigger = cEventTriggers::UPDATE;
     cur_word = cur_line.PopWord();
   }else if( cur_word == "g"  ||
-	    cur_word == "generation" ){
+            cur_word == "generation" ){
     trigger = cEventTriggers::GENERATION;
     cur_word = cur_line.PopWord();
   }else{
     // If Trigger is skipped so assume IMMEDIATE
     trigger = cEventTriggers::IMMEDIATE;
   }
-
+  
   // Do we now have timing specified?
   // Parse the Timing
   cString timing_str = cur_word;
-
+  
   // Get the start:interval:stop
   tmp = timing_str.Pop(':');
-
+  
   // If first value is valid, we are getting a timing.
   if( tmp.IsNumber() || tmp == "begin" ){
-
+    
     // First number is start
     if( tmp == "begin" ){
       start = cEventTriggers::TRIGGER_BEGIN;
     }else{
       start = tmp.AsDouble();
     }
-
+    
     // If no other words... is "start" syntax
     if( timing_str.GetSize() == 0 ){
       interval = cEventTriggers::TRIGGER_ONCE;
@@ -372,37 +372,37 @@
       // Second word is interval
       tmp = timing_str.Pop(':');
       if( tmp == "all" ){
-	  interval = cEventTriggers::TRIGGER_ALL;
+        interval = cEventTriggers::TRIGGER_ALL;
       }else if( tmp == "once" ){
-	interval = cEventTriggers::TRIGGER_ONCE;
+        interval = cEventTriggers::TRIGGER_ONCE;
       }else{
-	interval = tmp.AsDouble();
+        interval = tmp.AsDouble();
       }
       // If no other words... is "start:interval" syntax
       if( timing_str.GetSize() == 0 ){
-	stop     = cEventTriggers::TRIGGER_END;
+        stop     = cEventTriggers::TRIGGER_END;
       }else{
-	// We have "start:interval:stop" syntax
-	tmp = timing_str;
-	if( tmp == "end" ){
-	  stop = cEventTriggers::TRIGGER_END;
-	}else{
-	  stop = tmp.AsDouble();
-	}
+        // We have "start:interval:stop" syntax
+        tmp = timing_str;
+        if( tmp == "end" ){
+          stop = cEventTriggers::TRIGGER_END;
+        }else{
+          stop = tmp.AsDouble();
+        }
       }
     }
     cur_word = cur_line.PopWord(); // timing provided, so get next word
-
+    
   }else{ // We don't have timing, so assume IMMEDIATE
     trigger = cEventTriggers::IMMEDIATE;
     start = cEventTriggers::TRIGGER_BEGIN;
     interval = cEventTriggers::TRIGGER_ONCE;
     stop = cEventTriggers::TRIGGER_END;
   }
-
+  
   // Get the rest of the info
   name = cur_word;
   arg_list = cur_line;
-
+  
   return AddEvent( trigger, start, interval, stop, name, arg_list );
 }

Deleted: branches/brysonda/source/event/population_event.cc
===================================================================
--- branches/brysonda/source/event/population_event.cc	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/population_event.cc	2005-06-10 19:24:15 UTC (rev 201)
@@ -1,22 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Copyright (C) 1993 - 2003 California Institute of Technology             //
-//                                                                          //
-// Read the COPYING and README files, or contact 'avida at alife.org',         //
-// before continuing.  SOME RESTRICTIONS MAY APPLY TO USE OF THIS FILE.     //
-//////////////////////////////////////////////////////////////////////////////
-
-#ifndef POPULATION_EVENT_HH
-#include "population_event.hh"
-#endif
-
-#ifndef EVENT_HH
-#include "event.hh"
-#endif
-#ifndef STRING_HH
-#include "string.hh"
-#endif
-
-cPopulationEvent::cPopulationEvent(const cString & name, const cString & args):
-   cEvent(name, args)
-{
-}

Modified: branches/brysonda/source/event/population_event.hh
===================================================================
--- branches/brysonda/source/event/population_event.hh	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/population_event.hh	2005-06-10 19:24:15 UTC (rev 201)
@@ -19,17 +19,16 @@
 private:
   // not implemented. prevents inadvertend wrong instantiation.
   cPopulationEvent();
-  cPopulationEvent( const cPopulationEvent & );
-  const cPopulationEvent& operator=( cPopulationEvent & );
+  cPopulationEvent(const cPopulationEvent&);
+  const cPopulationEvent& operator=(cPopulationEvent&);
 
-  
 protected:
   cPopulation *population;
   
 public:
-  cPopulationEvent(const cString & name, const cString & args);
+  cPopulationEvent(const cString& name, const cString& args) : cEvent(name, args) { ; }
 
-  void SetPopulation( cPopulation *pop ){ population = pop; }
+  void SetPopulation(cPopulation* pop) { population = pop; }
 };
 
 #endif

Modified: branches/brysonda/source/event/population_event_factory.cc
===================================================================
--- branches/brysonda/source/event/population_event_factory.cc	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/population_event_factory.cc	2005-06-10 19:24:15 UTC (rev 201)
@@ -105,7 +105,7 @@
 class cPopulationEventexit : public cPopulationEvent {
 private:
 public:
-  cPopulationEventexit(const cString & in_args):
+  cPopulationEventexit(const cString& in_key, const cString& in_args):
   cPopulationEvent("exit", in_args) {
     (void)in_args; }
   ///// exit /////
@@ -130,7 +130,7 @@
 private:
   int max_generation;
 public:
-  cPopulationEventexit_if_generation_greater_than(const cString & in_args):
+  cPopulationEventexit_if_generation_greater_than(const cString& in_key, const cString& in_args):
   cPopulationEvent("exit_if_generation_greater_than", in_args) {
     
     cString args(in_args);
@@ -160,7 +160,7 @@
 private:
   int max_update;
 public:
-  cPopulationEventexit_if_update_greater_than(const cString & in_args):
+  cPopulationEventexit_if_update_greater_than(const cString& in_key, const cString& in_args):
   cPopulationEvent("exit_if_update_greater_than", in_args) {
     
     cString args(in_args);
@@ -190,7 +190,7 @@
 private:
   double lineage_label_crit_value;
 public:
-  cPopulationEventexit_if_ave_lineage_label_smaller(const cString & in_args):
+  cPopulationEventexit_if_ave_lineage_label_smaller(const cString& in_key, const cString& in_args):
   cPopulationEvent("exit_if_ave_lineage_label_smaller", in_args) {
     
     cString args(in_args);
@@ -220,7 +220,7 @@
 private:
   double lineage_label_crit_value;
 public:
-  cPopulationEventexit_if_ave_lineage_label_larger(const cString & in_args):
+  cPopulationEventexit_if_ave_lineage_label_larger(const cString& in_key, const cString& in_args):
   cPopulationEvent("exit_if_ave_lineage_label_larger", in_args) {
     
     cString args(in_args);
@@ -249,7 +249,7 @@
 private:
   cString mesg;
 public:
-  cPopulationEventecho(const cString & in_args):
+  cPopulationEventecho(const cString& in_key, const cString& in_args):
   cPopulationEvent("echo", in_args) {
     
     cString args(in_args);
@@ -283,7 +283,7 @@
   cString filename;
   cString format;
 public:
-    cPopulationEventprint_data(const cString & in_args):
+    cPopulationEventprint_data(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_data", in_args) {
       
       cString args(in_args);
@@ -311,7 +311,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_average_data(const cString & in_args):
+  cPopulationEventprint_average_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_average_data", in_args) {
     
     cString args(in_args);
@@ -338,7 +338,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_error_data(const cString & in_args):
+  cPopulationEventprint_error_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_error_data", in_args) {
     
     cString args(in_args);
@@ -365,7 +365,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_variance_data(const cString & in_args):
+  cPopulationEventprint_variance_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_variance_data", in_args) {
     
     cString args(in_args);
@@ -392,7 +392,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_dominant_data(const cString & in_args):
+  cPopulationEventprint_dominant_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_dominant_data", in_args) {
     
     cString args(in_args);
@@ -419,7 +419,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_stats_data(const cString & in_args):
+  cPopulationEventprint_stats_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_stats_data", in_args) {
     
     cString args(in_args);
@@ -446,7 +446,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_count_data(const cString & in_args):
+  cPopulationEventprint_count_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_count_data", in_args) {
     
     cString args(in_args);
@@ -473,7 +473,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_totals_data(const cString & in_args):
+  cPopulationEventprint_totals_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_totals_data", in_args) {
     
     cString args(in_args);
@@ -501,7 +501,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_tasks_data(const cString & in_args):
+  cPopulationEventprint_tasks_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_tasks_data", in_args) {
     
     cString args(in_args);
@@ -523,7 +523,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_tasks_exe_data(const cString & in_args):
+  cPopulationEventprint_tasks_exe_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_tasks_exe_data", in_args) {
     
     cString args(in_args);
@@ -545,7 +545,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_resource_data(const cString & in_args):
+  cPopulationEventprint_resource_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_resource_data", in_args) {
     
     cString args(in_args);
@@ -572,7 +572,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_time_data(const cString & in_args):
+  cPopulationEventprint_time_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_time_data", in_args) {
     
     cString args(in_args);
@@ -594,7 +594,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_mutation_data(const cString & in_args):
+  cPopulationEventprint_mutation_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_mutation_data", in_args) {
     
     cString args(in_args);
@@ -619,7 +619,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_mutation_rate_data(const cString & in_args):
+  cPopulationEventprint_mutation_rate_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_mutation_rate_data", in_args) {
     
     cString args(in_args);
@@ -644,7 +644,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_divide_mut_data(const cString & in_args):
+  cPopulationEventprint_divide_mut_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_divide_mut_data", in_args) {
     
     cString args(in_args);
@@ -671,7 +671,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_dom_parasite_data(const cString & in_args):
+  cPopulationEventprint_dom_parasite_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_dom_parasite_data", in_args) {
     
     cString args(in_args);
@@ -696,7 +696,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_instruction_data(const cString & in_args):
+  cPopulationEventprint_instruction_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_instruction_data", in_args) {
     
     cString args(in_args);
@@ -725,7 +725,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_instruction_abundance_histogram(const cString & in_args):
+  cPopulationEventprint_instruction_abundance_histogram(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_instruction_abundance_histogram", in_args) {
     
     cString args(in_args);
@@ -748,7 +748,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_depth_histogram(const cString & in_args):
+  cPopulationEventprint_depth_histogram(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_depth_histogram", in_args) {
     
     cString args(in_args);
@@ -776,7 +776,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_genotype_abundance_histogram(const cString & in_args):
+  cPopulationEventprint_genotype_abundance_histogram(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_genotype_abundance_histogram", in_args) {
     
     cString args(in_args);
@@ -804,7 +804,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_species_abundance_histogram(const cString & in_args):
+  cPopulationEventprint_species_abundance_histogram(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_species_abundance_histogram", in_args) {
     
     cString args(in_args);
@@ -828,7 +828,7 @@
   cString fname;
   int verbose;
 public:
-    cPopulationEventprint_lineage_totals(const cString & in_args):
+    cPopulationEventprint_lineage_totals(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_lineage_totals", in_args) {
       
       cString args(in_args);
@@ -861,7 +861,7 @@
   cString fname;
   int verbose;
 public:
-    cPopulationEventprint_lineage_counts(const cString & in_args):
+    cPopulationEventprint_lineage_counts(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_lineage_counts", in_args) {
       
       cString args(in_args);
@@ -905,7 +905,7 @@
 private:
   cString in_filename;
 public:
-  cPopulationEventprint_dom(const cString & in_args):
+  cPopulationEventprint_dom(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_dom", in_args) {
     
     cString args(in_args);
@@ -929,7 +929,7 @@
 private:
   cString in_filename;
 public:
-  cPopulationEventparasite_debug(const cString & in_args):
+  cPopulationEventparasite_debug(const cString& in_key, const cString& in_args):
   cPopulationEvent("parasite_debug", in_args) {
     
     cString args(in_args);
@@ -959,7 +959,7 @@
 private:
   cString in_filename;
 public:
-  cPopulationEventprint_dom_parasite(const cString & in_args):
+  cPopulationEventprint_dom_parasite(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_dom_parasite", in_args) {
     
     cString args(in_args);
@@ -986,7 +986,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_genotype_map(const cString & in_args):
+  cPopulationEventprint_genotype_map(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_genotype_map", in_args) {
     
     cString args(in_args);
@@ -1011,7 +1011,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_number_phenotypes(const cString & in_args):
+  cPopulationEventprint_number_phenotypes(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_number_phenotypes", in_args) {
     
     cString args(in_args);
@@ -1035,7 +1035,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventprint_phenotype_status(const cString & in_args):
+  cPopulationEventprint_phenotype_status(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_phenotype_status", in_args) {
     
     cString args(in_args);
@@ -1064,7 +1064,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventsave_population(const cString & in_args):
+  cPopulationEventsave_population(const cString& in_key, const cString& in_args):
   cPopulationEvent("save_population", in_args) {
     
     cString args(in_args);
@@ -1096,7 +1096,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventload_population(const cString & in_args):
+  cPopulationEventload_population(const cString& in_key, const cString& in_args):
   cPopulationEvent("load_population", in_args) {
     
     cString args(in_args);
@@ -1119,7 +1119,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventsave_clone(const cString & in_args):
+  cPopulationEventsave_clone(const cString& in_key, const cString& in_args):
   cPopulationEvent("save_clone", in_args) {
     
     cString args(in_args);
@@ -1146,7 +1146,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventload_clone(const cString & in_args):
+  cPopulationEventload_clone(const cString& in_key, const cString& in_args):
   cPopulationEvent("load_clone", in_args) {
     
     cString args(in_args);
@@ -1173,7 +1173,7 @@
   cString fname;
   int update;
 public:
-    cPopulationEventload_dump_file(const cString & in_args):
+    cPopulationEventload_dump_file(const cString& in_key, const cString& in_args):
     cPopulationEvent("load_dump_file", in_args) {
       
       cString args(in_args);
@@ -1203,7 +1203,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdump_pop(const cString & in_args):
+  cPopulationEventdump_pop(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_pop", in_args) {
     
     cString args(in_args);
@@ -1246,7 +1246,7 @@
   int historic;
   cString fname;
 public:
-    cPopulationEventprint_genotypes(const cString & in_args):
+    cPopulationEventprint_genotypes(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_genotypes", in_args) {
       
       cString args(in_args);
@@ -1280,7 +1280,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdetail_pop(const cString & in_args):
+  cPopulationEventdetail_pop(const cString& in_key, const cString& in_args):
   cPopulationEvent("detail_pop", in_args) {
     
     cString args(in_args);
@@ -1313,7 +1313,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdetail_sex_pop(const cString & in_args):
+  cPopulationEventdetail_sex_pop(const cString& in_key, const cString& in_args):
   cPopulationEvent("detail_sex_pop", in_args) {
     
     cString args(in_args);
@@ -1345,7 +1345,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdetail_parasite_pop(const cString & in_args):
+  cPopulationEventdetail_parasite_pop(const cString& in_key, const cString& in_args):
   cPopulationEvent("detail_parasite_pop", in_args) {
     
     cString args(in_args);
@@ -1384,7 +1384,7 @@
   int back_dist;
   cString fname;
 public:
-    cPopulationEventdump_historic_pop(const cString & in_args):
+    cPopulationEventdump_historic_pop(const cString& in_key, const cString& in_args):
     cPopulationEvent("dump_historic_pop", in_args) {
       
       cString args(in_args);
@@ -1418,7 +1418,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdump_historic_sex_pop(const cString & in_args):
+  cPopulationEventdump_historic_sex_pop(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_historic_sex_pop", in_args) {
     
     cString args(in_args);
@@ -1446,7 +1446,7 @@
 private:
   cString fname;
 public:
-  cPopulationEventdump_memory(const cString & in_args):
+  cPopulationEventdump_memory(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_memory", in_args) {
     
     cString args(in_args);
@@ -1492,7 +1492,7 @@
   int lineage_label;
   double neutral_metric;
 public:
-    cPopulationEventinject(const cString & in_args):
+    cPopulationEventinject(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject", in_args) {
       
       cString args(in_args);
@@ -1537,7 +1537,7 @@
   int lineage_label;
   double neutral_metric;
 public:
-    cPopulationEventinject_all(const cString & in_args):
+    cPopulationEventinject_all(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_all", in_args) {
       
       cString args(in_args);
@@ -1595,7 +1595,7 @@
   int lineage_label;
   double neutral_metric;
 public:
-    cPopulationEventinject_range(const cString & in_args):
+    cPopulationEventinject_range(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_range", in_args) {
       
       cString args(in_args);
@@ -1661,7 +1661,7 @@
   int lineage_label;
   double neutral_metric;
 public:
-    cPopulationEventinject_sequence(const cString & in_args):
+    cPopulationEventinject_sequence(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_sequence", in_args) {
       
       cString args(in_args);
@@ -1719,7 +1719,7 @@
   int lineage_label;
   double neutral_metric;
 public:
-    cPopulationEventinject_random(const cString & in_args):
+    cPopulationEventinject_random(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_random", in_args) {
       
       cString args(in_args);
@@ -1776,7 +1776,7 @@
   double neutral_metric;
   int mem_space;
 public:
-    cPopulationEventinject_range_parasite(const cString & in_args):
+    cPopulationEventinject_range_parasite(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_range_parasite", in_args) {
       
       cString args(in_args);
@@ -1847,7 +1847,7 @@
   double neutral_metric;
   int mem_space;
 public:
-    cPopulationEventinject_range_pair(const cString & in_args):
+    cPopulationEventinject_range_pair(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_range_pair", in_args) {
       
       cString args(in_args);
@@ -1893,7 +1893,7 @@
 class cPopulationEventzero_muts : public cPopulationEvent {
 private:
 public:
-  cPopulationEventzero_muts(const cString & in_args):
+  cPopulationEventzero_muts(const cString& in_key, const cString& in_args):
   cPopulationEvent("zero_muts", in_args) {
     (void)in_args; }
   ///// zero_muts /////
@@ -1915,7 +1915,7 @@
   double cmut_inc;
   int cell;
 public:
-    cPopulationEventmod_copy_mut(const cString & in_args):
+    cPopulationEventmod_copy_mut(const cString& in_key, const cString& in_args):
     cPopulationEvent("mod_copy_mut", in_args) {
       
       cString args(in_args);
@@ -1947,7 +1947,7 @@
   double dmut_inc;
   int cell;
 public:
-    cPopulationEventmod_div_mut(const cString & in_args):
+    cPopulationEventmod_div_mut(const cString& in_key, const cString& in_args):
     cPopulationEvent("mod_div_mut", in_args) {
       
       cString args(in_args);
@@ -1980,7 +1980,7 @@
   int start_cell;
   int end_cell;
 public:
-    cPopulationEventset_copy_mut(const cString & in_args):
+    cPopulationEventset_copy_mut(const cString& in_key, const cString& in_args):
     cPopulationEvent("set_copy_mut", in_args) {
       
       cString args(in_args);
@@ -2017,7 +2017,7 @@
   double pmut_inc;
   int cell;
 public:
-    cPopulationEventmod_point_mut(const cString & in_args):
+    cPopulationEventmod_point_mut(const cString& in_key, const cString& in_args):
     cPopulationEvent("mod_point_mut", in_args) {
       
       cString args(in_args);
@@ -2049,7 +2049,7 @@
   double pmut;
   int cell;
 public:
-    cPopulationEventset_point_mut(const cString & in_args):
+    cPopulationEventset_point_mut(const cString& in_key, const cString& in_args):
     cPopulationEvent("set_point_mut", in_args) {
       
       cString args(in_args);
@@ -2079,7 +2079,7 @@
 private:
   int landscape_dist;
 public:
-  cPopulationEventcalc_landscape(const cString & in_args):
+  cPopulationEventcalc_landscape(const cString& in_key, const cString& in_args):
   cPopulationEvent("calc_landscape", in_args) {
     
     cString args(in_args);
@@ -2103,7 +2103,7 @@
 private:
   cString datafile;
 public:
-  cPopulationEventpredict_w_landscape(const cString & in_args):
+  cPopulationEventpredict_w_landscape(const cString& in_key, const cString& in_args):
   cPopulationEvent("predict_w_landscape", in_args) {
     
     cString args(in_args);
@@ -2128,7 +2128,7 @@
 private:
   cString datafile;
 public:
-  cPopulationEventpredict_nu_landscape(const cString & in_args):
+  cPopulationEventpredict_nu_landscape(const cString& in_key, const cString& in_args):
   cPopulationEvent("predict_nu_landscape", in_args) {
     
     cString args(in_args);
@@ -2153,7 +2153,7 @@
 private:
   int sample_size;
 public:
-  cPopulationEventsample_landscape(const cString & in_args):
+  cPopulationEventsample_landscape(const cString& in_key, const cString& in_args):
   cPopulationEvent("sample_landscape", in_args) {
     
     cString args(in_args);
@@ -2184,7 +2184,7 @@
   int max_sample_size;
   bool print_if_found;
 public:
-    cPopulationEventrandom_landscape(const cString & in_args):
+    cPopulationEventrandom_landscape(const cString& in_key, const cString& in_args):
     cPopulationEvent("random_landscape", in_args) {
       
       cString args(in_args);
@@ -2217,7 +2217,7 @@
   int min_found;
   int max_sample_size;
 public:
-    cPopulationEventanalyze_landscape(const cString & in_args):
+    cPopulationEventanalyze_landscape(const cString& in_key, const cString& in_args):
     cPopulationEvent("analyze_landscape", in_args) {
       
       cString args(in_args);
@@ -2246,7 +2246,7 @@
 private:
   int sample_size;
 public:
-  cPopulationEventpairtest_landscape(const cString & in_args):
+  cPopulationEventpairtest_landscape(const cString& in_key, const cString& in_args):
   cPopulationEvent("pairtest_landscape", in_args) {
     
     cString args(in_args);
@@ -2268,7 +2268,7 @@
 class cPopulationEventtest_dom : public cPopulationEvent {
 private:
 public:
-  cPopulationEventtest_dom(const cString & in_args):
+  cPopulationEventtest_dom(const cString& in_key, const cString& in_args):
   cPopulationEvent("test_dom", in_args) {
     (void)in_args; }
   ///// test_dom /////
@@ -2292,7 +2292,7 @@
   int save_genotype;
   cString filename;
 public:
-    cPopulationEventanalyze_population(const cString & in_args):
+    cPopulationEventanalyze_population(const cString& in_key, const cString& in_args):
     cPopulationEvent("analyze_population", in_args) {
       
       cString args(in_args);
@@ -2330,7 +2330,7 @@
   cString filename2;
   cString filename3;
 public:
-    cPopulationEventprint_detailed_fitness_data(const cString & in_args):
+    cPopulationEventprint_detailed_fitness_data(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_detailed_fitness_data", in_args) {
       
       cString args(in_args);
@@ -2366,7 +2366,7 @@
   cString creature_name;
   cString filename;
 public:
-    cPopulationEventprint_genetic_distance_data(const cString & in_args):
+    cPopulationEventprint_genetic_distance_data(const cString& in_key, const cString& in_args):
     cPopulationEvent("print_genetic_distance_data", in_args) {
       
       cString args(in_args);
@@ -2394,7 +2394,7 @@
   cString filename;
   int save_genotype;
 public:
-    cPopulationEventgenetic_distance_pop_dump(const cString & in_args):
+    cPopulationEventgenetic_distance_pop_dump(const cString& in_key, const cString& in_args):
     cPopulationEvent("genetic_distance_pop_dump", in_args) {
       
       cString args(in_args);
@@ -2426,7 +2426,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventtask_snapshot(const cString & in_args):
+  cPopulationEventtask_snapshot(const cString& in_key, const cString& in_args):
   cPopulationEvent("task_snapshot", in_args) {
     
     cString args(in_args);
@@ -2454,7 +2454,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_viable_tasks_data(const cString & in_args):
+  cPopulationEventprint_viable_tasks_data(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_viable_tasks_data", in_args) {
     
     cString args(in_args);
@@ -2482,7 +2482,7 @@
 private:
   double kill_prob;
 public:
-  cPopulationEventapocalypse(const cString & in_args):
+  cPopulationEventapocalypse(const cString& in_key, const cString& in_args):
   cPopulationEvent("apocalypse", in_args) {
     
     cString args(in_args);
@@ -2517,7 +2517,7 @@
   int cell_X2;
   int cell_Y2;
 public:
-    cPopulationEventkill_rectangle(const cString & in_args):
+    cPopulationEventkill_rectangle(const cString& in_key, const cString& in_args):
     cPopulationEvent("kill_rectangle", in_args) {
       
       cString args(in_args);
@@ -2591,7 +2591,7 @@
 private:
   double kill_rate;
 public:
-  cPopulationEventrate_kill(const cString & in_args):
+  cPopulationEventrate_kill(const cString& in_key, const cString& in_args):
   cPopulationEvent("rate_kill", in_args) {
     
     cString args(in_args);
@@ -2636,7 +2636,7 @@
   int transfer_size;
   int ignore_deads;
 public:
-    cPopulationEventserial_transfer(const cString & in_args):
+    cPopulationEventserial_transfer(const cString& in_key, const cString& in_args):
     cPopulationEvent("serial_transfer", in_args) {
       
       cString args(in_args);
@@ -2659,7 +2659,7 @@
 class cPopulationEventhillclimb : public cPopulationEvent {
 private:
 public:
-  cPopulationEventhillclimb(const cString & in_args):
+  cPopulationEventhillclimb(const cString& in_key, const cString& in_args):
   cPopulationEvent("hillclimb", in_args) {
     (void)in_args; }
   ///// hillclimb /////
@@ -2680,7 +2680,7 @@
 class cPopulationEventhillclimb_neut : public cPopulationEvent {
 private:
 public:
-  cPopulationEventhillclimb_neut(const cString & in_args):
+  cPopulationEventhillclimb_neut(const cString& in_key, const cString& in_args):
   cPopulationEvent("hillclimb_neut", in_args) {
     (void)in_args; }
   ///// hillclimb_neut /////
@@ -2701,7 +2701,7 @@
 class cPopulationEventhillclimb_rand : public cPopulationEvent {
 private:
 public:
-  cPopulationEventhillclimb_rand(const cString & in_args):
+  cPopulationEventhillclimb_rand(const cString& in_key, const cString& in_args):
   cPopulationEvent("hillclimb_rand", in_args) {
     (void)in_args; }
   ///// hillclimb_rand /////
@@ -2730,7 +2730,7 @@
 private:
   int competition_type;
 public:
-  cPopulationEventcompete_demes(const cString & in_args):
+  cPopulationEventcompete_demes(const cString& in_key, const cString& in_args):
   cPopulationEvent("compete_demes", in_args) {
     
     cString args(in_args);
@@ -2753,7 +2753,7 @@
 class cPopulationEventreset_demes : public cPopulationEvent {
 private:
 public:
-  cPopulationEventreset_demes(const cString & in_args):
+  cPopulationEventreset_demes(const cString& in_key, const cString& in_args):
   cPopulationEvent("reset_demes", in_args) {
     (void)in_args; }
   ///// reset_demes /////
@@ -2772,7 +2772,7 @@
 class cPopulationEventprint_deme_stats : public cPopulationEvent {
 private:
 public:
-  cPopulationEventprint_deme_stats(const cString & in_args):
+  cPopulationEventprint_deme_stats(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_deme_stats", in_args) {
     (void)in_args; }
   ///// print_deme_stats /////
@@ -2794,7 +2794,7 @@
   int deme1_id;
   int deme2_id;
 public:
-    cPopulationEventcopy_deme(const cString & in_args):
+    cPopulationEventcopy_deme(const cString& in_key, const cString& in_args):
     cPopulationEvent("copy_deme", in_args) {
       
       cString args(in_args);
@@ -2822,7 +2822,7 @@
 private:
   int lines_saved;
 public:
-  cPopulationEventcalc_consensus(const cString & in_args):
+  cPopulationEventcalc_consensus(const cString& in_key, const cString& in_args):
   cPopulationEvent("calc_consensus", in_args) {
     
     cString args(in_args);
@@ -2845,7 +2845,7 @@
   int num_trials;
   cString filename;
 public:
-    cPopulationEventtest_size_change_robustness(const cString & in_args):
+    cPopulationEventtest_size_change_robustness(const cString& in_key, const cString& in_args):
     cPopulationEvent("test_size_change_robustness", in_args) {
       
       cString args(in_args);
@@ -2871,7 +2871,7 @@
 class cPopulationEventtest_threads : public cPopulationEvent {
 private:
 public:
-  cPopulationEventtest_threads(const cString & in_args):
+  cPopulationEventtest_threads(const cString& in_key, const cString& in_args):
   cPopulationEvent("test_threads", in_args) {
     (void)in_args; }
   ///// test_threads /////
@@ -2889,7 +2889,7 @@
 class cPopulationEventprint_threads : public cPopulationEvent {
 private:
 public:
-  cPopulationEventprint_threads(const cString & in_args):
+  cPopulationEventprint_threads(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_threads", in_args) {
     (void)in_args; }
   ///// print_threads /////
@@ -2912,7 +2912,7 @@
 class cPopulationEventdump_fitness_grid : public cPopulationEvent {
 private:
 public:
-  cPopulationEventdump_fitness_grid(const cString & in_args):
+  cPopulationEventdump_fitness_grid(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_fitness_grid", in_args) {
     (void)in_args; }
   ///// dump_fitness_grid /////
@@ -2946,7 +2946,7 @@
 class cPopulationEventdump_genotype_grid : public cPopulationEvent {
 private:
 public:
-  cPopulationEventdump_genotype_grid(const cString & in_args):
+  cPopulationEventdump_genotype_grid(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_genotype_grid", in_args) {
     (void)in_args; }
   ///// dump_genotype_grid /////
@@ -2978,7 +2978,7 @@
 class cPopulationEventdump_task_grid : public cPopulationEvent {
 private:
 public:
-  cPopulationEventdump_task_grid(const cString & in_args):
+  cPopulationEventdump_task_grid(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_task_grid", in_args) {
     (void)in_args; }
   ///// dump_task_grid /////
@@ -3003,7 +3003,7 @@
 class cPopulationEventdump_donor_grid : public cPopulationEvent {
 private:
 public:
-  cPopulationEventdump_donor_grid(const cString & in_args):
+  cPopulationEventdump_donor_grid(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_donor_grid", in_args) {
     (void)in_args; }
   ///// dump_donor_grid /////
@@ -3036,7 +3036,7 @@
 class cPopulationEventdump_receiver_grid : public cPopulationEvent {
 private:
 public:
-  cPopulationEventdump_receiver_grid(const cString & in_args):
+  cPopulationEventdump_receiver_grid(const cString& in_key, const cString& in_args):
   cPopulationEvent("dump_receiver_grid", in_args) {
     (void)in_args; }
   ///// dump_receiver_grid /////
@@ -3067,7 +3067,7 @@
 private:
   cString filename;
 public:
-  cPopulationEventprint_tree_depths(const cString & in_args):
+  cPopulationEventprint_tree_depths(const cString& in_key, const cString& in_args):
   cPopulationEvent("print_tree_depths", in_args) {
     
     cString args(in_args);
@@ -3101,7 +3101,7 @@
   int min_row;
   int max_row;
 public:
-    cPopulationEventsever_grid_col(const cString & in_args):
+    cPopulationEventsever_grid_col(const cString& in_key, const cString& in_args):
     cPopulationEvent("sever_grid_col", in_args) {
       
       cString args(in_args);
@@ -3162,7 +3162,7 @@
   int min_col;
   int max_col;
 public:
-    cPopulationEventsever_grid_row(const cString & in_args):
+    cPopulationEventsever_grid_row(const cString& in_key, const cString& in_args):
     cPopulationEvent("sever_grid_row", in_args) {
       
       cString args(in_args);
@@ -3223,7 +3223,7 @@
   int min_row;
   int max_row;
 public:
-    cPopulationEventjoin_grid_col(const cString & in_args):
+    cPopulationEventjoin_grid_col(const cString& in_key, const cString& in_args):
     cPopulationEvent("join_grid_col", in_args) {
       
       cString args(in_args);
@@ -3288,7 +3288,7 @@
   int min_col;
   int max_col;
 public:
-    cPopulationEventjoin_grid_row(const cString & in_args):
+    cPopulationEventjoin_grid_row(const cString& in_key, const cString& in_args):
     cPopulationEvent("join_grid_row", in_args) {
       
       cString args(in_args);
@@ -3349,7 +3349,7 @@
   int cellB_x;
   int cellB_y;
 public:
-    cPopulationEventconnect_cells(const cString & in_args):
+    cPopulationEventconnect_cells(const cString& in_key, const cString& in_args):
     cPopulationEvent("connect_cells", in_args) {
       
       cString args(in_args);
@@ -3396,7 +3396,7 @@
   int cellB_x;
   int cellB_y;
 public:
-    cPopulationEventdisconnect_cells(const cString & in_args):
+    cPopulationEventdisconnect_cells(const cString& in_key, const cString& in_args):
     cPopulationEvent("disconnect_cells", in_args) {
       
       cString args(in_args);
@@ -3439,7 +3439,7 @@
   cString res_name;
   double res_count;
 public:
-    cPopulationEventinject_resource(const cString & in_args):
+    cPopulationEventinject_resource(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_resource", in_args) {
       
       cString args(in_args);
@@ -3466,7 +3466,7 @@
   cString res_name;
   double res_count;
 public:
-    cPopulationEventset_resource(const cString & in_args):
+    cPopulationEventset_resource(const cString& in_key, const cString& in_args):
     cPopulationEvent("set_resource", in_args) {
       
       cString args(in_args);
@@ -3496,7 +3496,7 @@
   cString res_name;
   double res_count;
 public:
-    cPopulationEventinject_scaled_resource(const cString & in_args):
+    cPopulationEventinject_scaled_resource(const cString& in_key, const cString& in_args):
     cPopulationEvent("inject_scaled_resource", in_args) {
       
       cString args(in_args);
@@ -3528,7 +3528,7 @@
   cString res_name;
   double res_perc;
 public:
-    cPopulationEventoutflow_scaled_resource(const cString & in_args):
+    cPopulationEventoutflow_scaled_resource(const cString& in_key, const cString& in_args):
     cPopulationEvent("outflow_scaled_resource", in_args) {
       
       cString args(in_args);
@@ -3565,7 +3565,7 @@
   cString reaction_name;
   double reaction_value;
 public:
-    cPopulationEventset_reaction_value(const cString & in_args):
+    cPopulationEventset_reaction_value(const cString& in_key, const cString& in_args):
     cPopulationEvent("set_reaction_value", in_args) {
       
       cString args(in_args);
@@ -3590,7 +3590,7 @@
   cString reaction_name;
   double value_mult;
 public:
-    cPopulationEventset_reaction_value_mult(const cString & in_args):
+    cPopulationEventset_reaction_value_mult(const cString& in_key, const cString& in_args):
     cPopulationEvent("set_reaction_value_mult", in_args) {
       
       cString args(in_args);
@@ -3604,594 +3604,120 @@
 };
 
 
-// EventNameToEnum()
-int cPopulationEventFactory::EventNameToEnum(const cString & name) const{
-  if( name == "" ){
-    return cPopulationEventFactory::EVENT_NO_EVENT;
-  }else if (name == "exit") {
-    return cPopulationEventFactory::EVENT_exit;
-  }else if (name == "exit_if_generation_greater_than") {
-    return cPopulationEventFactory::EVENT_exit_if_generation_greater_than;
-  }else if (name == "exit_if_update_greater_than") {
-    return cPopulationEventFactory::EVENT_exit_if_update_greater_than;
-  }else if (name == "exit_if_ave_lineage_label_smaller") {
-    return cPopulationEventFactory::EVENT_exit_if_ave_lineage_label_smaller;
-  }else if (name == "exit_if_ave_lineage_label_larger") {
-    return cPopulationEventFactory::EVENT_exit_if_ave_lineage_label_larger;
-  }else if (name == "echo") {
-    return cPopulationEventFactory::EVENT_echo;
-  }else if (name == "print_data") {
-    return cPopulationEventFactory::EVENT_print_data;
-  }else if (name == "print_average_data") {
-    return cPopulationEventFactory::EVENT_print_average_data;
-  }else if (name == "print_error_data") {
-    return cPopulationEventFactory::EVENT_print_error_data;
-  }else if (name == "print_variance_data") {
-    return cPopulationEventFactory::EVENT_print_variance_data;
-  }else if (name == "print_dominant_data") {
-    return cPopulationEventFactory::EVENT_print_dominant_data;
-  }else if (name == "print_stats_data") {
-    return cPopulationEventFactory::EVENT_print_stats_data;
-  }else if (name == "print_count_data") {
-    return cPopulationEventFactory::EVENT_print_count_data;
-  }else if (name == "print_totals_data") {
-    return cPopulationEventFactory::EVENT_print_totals_data;
-  }else if (name == "print_tasks_data") {
-    return cPopulationEventFactory::EVENT_print_tasks_data;
-  }else if (name == "print_tasks_exe_data") {
-    return cPopulationEventFactory::EVENT_print_tasks_exe_data;
-  }else if (name == "print_resource_data") {
-    return cPopulationEventFactory::EVENT_print_resource_data;
-  }else if (name == "print_time_data") {
-    return cPopulationEventFactory::EVENT_print_time_data;
-  }else if (name == "print_mutation_data") {
-    return cPopulationEventFactory::EVENT_print_mutation_data;
-  }else if (name == "print_mutation_rate_data") {
-    return cPopulationEventFactory::EVENT_print_mutation_rate_data;
-  }else if (name == "print_divide_mut_data") {
-    return cPopulationEventFactory::EVENT_print_divide_mut_data;
-  }else if (name == "print_dom_parasite_data") {
-    return cPopulationEventFactory::EVENT_print_dom_parasite_data;
-  }else if (name == "print_instruction_data") {
-    return cPopulationEventFactory::EVENT_print_instruction_data;
-  }else if (name == "print_instruction_abundance_histogram") {
-    return cPopulationEventFactory::EVENT_print_instruction_abundance_histogram;
-  }else if (name == "print_depth_histogram") {
-    return cPopulationEventFactory::EVENT_print_depth_histogram;
-  }else if (name == "print_genotype_abundance_histogram") {
-    return cPopulationEventFactory::EVENT_print_genotype_abundance_histogram;
-  }else if (name == "print_species_abundance_histogram") {
-    return cPopulationEventFactory::EVENT_print_species_abundance_histogram;
-  }else if (name == "print_lineage_totals") {
-    return cPopulationEventFactory::EVENT_print_lineage_totals;
-  }else if (name == "print_lineage_counts") {
-    return cPopulationEventFactory::EVENT_print_lineage_counts;
-  }else if (name == "print_dom") {
-    return cPopulationEventFactory::EVENT_print_dom;
-  }else if (name == "parasite_debug") {
-    return cPopulationEventFactory::EVENT_parasite_debug;
-  }else if (name == "print_dom_parasite") {
-    return cPopulationEventFactory::EVENT_print_dom_parasite;
-  }else if (name == "print_genotype_map") {
-    return cPopulationEventFactory::EVENT_print_genotype_map;
-  }else if (name == "print_number_phenotypes") {
-    return cPopulationEventFactory::EVENT_print_number_phenotypes;
-  }else if (name == "print_phenotype_status") {
-    return cPopulationEventFactory::EVENT_print_phenotype_status;
-  }else if (name == "save_population") {
-    return cPopulationEventFactory::EVENT_save_population;
-  }else if (name == "load_population") {
-    return cPopulationEventFactory::EVENT_load_population;
-  }else if (name == "save_clone") {
-    return cPopulationEventFactory::EVENT_save_clone;
-  }else if (name == "load_clone") {
-    return cPopulationEventFactory::EVENT_load_clone;
-  }else if (name == "load_dump_file") {
-    return cPopulationEventFactory::EVENT_load_dump_file;
-  }else if (name == "dump_pop") {
-    return cPopulationEventFactory::EVENT_dump_pop;
-  }else if (name == "print_genotypes") {
-    return cPopulationEventFactory::EVENT_print_genotypes;
-  }else if (name == "detail_pop") {
-    return cPopulationEventFactory::EVENT_detail_pop;
-  }else if (name == "detail_sex_pop") {
-    return cPopulationEventFactory::EVENT_detail_sex_pop;
-  }else if (name == "detail_parasite_pop") {
-    return cPopulationEventFactory::EVENT_detail_parasite_pop;
-  }else if (name == "dump_historic_pop") {
-    return cPopulationEventFactory::EVENT_dump_historic_pop;
-  }else if (name == "dump_historic_sex_pop") {
-    return cPopulationEventFactory::EVENT_dump_historic_sex_pop;
-  }else if (name == "dump_memory") {
-    return cPopulationEventFactory::EVENT_dump_memory;
-  }else if (name == "inject") {
-    return cPopulationEventFactory::EVENT_inject;
-  }else if (name == "inject_all") {
-    return cPopulationEventFactory::EVENT_inject_all;
-  }else if (name == "inject_range") {
-    return cPopulationEventFactory::EVENT_inject_range;
-  }else if (name == "inject_sequence") {
-    return cPopulationEventFactory::EVENT_inject_sequence;
-  }else if (name == "inject_random") {
-    return cPopulationEventFactory::EVENT_inject_random;
-  }else if (name == "inject_range_parasite") {
-    return cPopulationEventFactory::EVENT_inject_range_parasite;
-  }else if (name == "inject_range_pair") {
-    return cPopulationEventFactory::EVENT_inject_range_pair;
-  }else if (name == "zero_muts") {
-    return cPopulationEventFactory::EVENT_zero_muts;
-  }else if (name == "mod_copy_mut") {
-    return cPopulationEventFactory::EVENT_mod_copy_mut;
-  }else if (name == "mod_div_mut") {
-    return cPopulationEventFactory::EVENT_mod_div_mut;
-  }else if (name == "set_copy_mut") {
-    return cPopulationEventFactory::EVENT_set_copy_mut;
-  }else if (name == "mod_point_mut") {
-    return cPopulationEventFactory::EVENT_mod_point_mut;
-  }else if (name == "set_point_mut") {
-    return cPopulationEventFactory::EVENT_set_point_mut;
-  }else if (name == "calc_landscape") {
-    return cPopulationEventFactory::EVENT_calc_landscape;
-  }else if (name == "predict_w_landscape") {
-    return cPopulationEventFactory::EVENT_predict_w_landscape;
-  }else if (name == "predict_nu_landscape") {
-    return cPopulationEventFactory::EVENT_predict_nu_landscape;
-  }else if (name == "sample_landscape") {
-    return cPopulationEventFactory::EVENT_sample_landscape;
-  }else if (name == "random_landscape") {
-    return cPopulationEventFactory::EVENT_random_landscape;
-  }else if (name == "analyze_landscape") {
-    return cPopulationEventFactory::EVENT_analyze_landscape;
-  }else if (name == "pairtest_landscape") {
-    return cPopulationEventFactory::EVENT_pairtest_landscape;
-  }else if (name == "test_dom") {
-    return cPopulationEventFactory::EVENT_test_dom;
-  }else if (name == "analyze_population") {
-    return cPopulationEventFactory::EVENT_analyze_population;
-  }else if (name == "print_detailed_fitness_data") {
-    return cPopulationEventFactory::EVENT_print_detailed_fitness_data;
-  }else if (name == "print_genetic_distance_data") {
-    return cPopulationEventFactory::EVENT_print_genetic_distance_data;
-  }else if (name == "genetic_distance_pop_dump") {
-    return cPopulationEventFactory::EVENT_genetic_distance_pop_dump;
-  }else if (name == "task_snapshot") {
-    return cPopulationEventFactory::EVENT_task_snapshot;
-  }else if (name == "print_viable_tasks_data") {
-    return cPopulationEventFactory::EVENT_print_viable_tasks_data;
-  }else if (name == "apocalypse") {
-    return cPopulationEventFactory::EVENT_apocalypse;
-  }else if (name == "kill_rectangle") {
-    return cPopulationEventFactory::EVENT_kill_rectangle;
-  }else if (name == "rate_kill") {
-    return cPopulationEventFactory::EVENT_rate_kill;
-  }else if (name == "serial_transfer") {
-    return cPopulationEventFactory::EVENT_serial_transfer;
-  }else if (name == "hillclimb") {
-    return cPopulationEventFactory::EVENT_hillclimb;
-  }else if (name == "hillclimb_neut") {
-    return cPopulationEventFactory::EVENT_hillclimb_neut;
-  }else if (name == "hillclimb_rand") {
-    return cPopulationEventFactory::EVENT_hillclimb_rand;
-  }else if (name == "compete_demes") {
-    return cPopulationEventFactory::EVENT_compete_demes;
-  }else if (name == "reset_demes") {
-    return cPopulationEventFactory::EVENT_reset_demes;
-  }else if (name == "print_deme_stats") {
-    return cPopulationEventFactory::EVENT_print_deme_stats;
-  }else if (name == "copy_deme") {
-    return cPopulationEventFactory::EVENT_copy_deme;
-  }else if (name == "calc_consensus") {
-    return cPopulationEventFactory::EVENT_calc_consensus;
-  }else if (name == "test_size_change_robustness") {
-    return cPopulationEventFactory::EVENT_test_size_change_robustness;
-  }else if (name == "test_threads") {
-    return cPopulationEventFactory::EVENT_test_threads;
-  }else if (name == "print_threads") {
-    return cPopulationEventFactory::EVENT_print_threads;
-  }else if (name == "dump_fitness_grid") {
-    return cPopulationEventFactory::EVENT_dump_fitness_grid;
-  }else if (name == "dump_genotype_grid") {
-    return cPopulationEventFactory::EVENT_dump_genotype_grid;
-  }else if (name == "dump_task_grid") {
-    return cPopulationEventFactory::EVENT_dump_task_grid;
-  }else if (name == "dump_donor_grid") {
-    return cPopulationEventFactory::EVENT_dump_donor_grid;
-  }else if (name == "dump_receiver_grid") {
-    return cPopulationEventFactory::EVENT_dump_receiver_grid;
-  }else if (name == "print_tree_depths") {
-    return cPopulationEventFactory::EVENT_print_tree_depths;
-  }else if (name == "sever_grid_col") {
-    return cPopulationEventFactory::EVENT_sever_grid_col;
-  }else if (name == "sever_grid_row") {
-    return cPopulationEventFactory::EVENT_sever_grid_row;
-  }else if (name == "join_grid_col") {
-    return cPopulationEventFactory::EVENT_join_grid_col;
-  }else if (name == "join_grid_row") {
-    return cPopulationEventFactory::EVENT_join_grid_row;
-  }else if (name == "connect_cells") {
-    return cPopulationEventFactory::EVENT_connect_cells;
-  }else if (name == "disconnect_cells") {
-    return cPopulationEventFactory::EVENT_disconnect_cells;
-  }else if (name == "inject_resource") {
-    return cPopulationEventFactory::EVENT_inject_resource;
-  }else if (name == "set_resource") {
-    return cPopulationEventFactory::EVENT_set_resource;
-  }else if (name == "inject_scaled_resource") {
-    return cPopulationEventFactory::EVENT_inject_scaled_resource;
-  }else if (name == "outflow_scaled_resource") {
-    return cPopulationEventFactory::EVENT_outflow_scaled_resource;
-  }else if (name == "set_reaction_value") {
-    return cPopulationEventFactory::EVENT_set_reaction_value;
-  }else if (name == "set_reaction_value_mult") {
-    return cPopulationEventFactory::EVENT_set_reaction_value_mult;
-  }else{
-    return cPopulationEventFactory::EVENT_undefined;
-  }
-}
-
-
 /////////////////
 // cPopulationEventFactory
 /////////////////
 
-cPopulationEventFactory::cPopulationEventFactory( cPopulation *pop ) 
-  : m_population( pop )
+cPopulationEventFactory::cPopulationEventFactory(cPopulation* pop) : m_population( pop )
 {
+  //"" :: cPopulationEventFactory::EVENT_NO_EVENT;
+  Register<cPopulationEventexit>("exit");
+  Register<cPopulationEventexit_if_generation_greater_than>("exit_if_generation_greater_than");
+  Register<cPopulationEventexit_if_update_greater_than>("exit_if_update_greater_than");
+  Register<cPopulationEventexit_if_ave_lineage_label_smaller>("exit_if_ave_lineage_label_smaller");
+  Register<cPopulationEventexit_if_ave_lineage_label_larger>("exit_if_ave_lineage_label_larger");
+  Register<cPopulationEventecho>("echo");
+  Register<cPopulationEventprint_data>("print_data");
+  Register<cPopulationEventprint_average_data>("print_average_data");
+  Register<cPopulationEventprint_error_data>("print_error_data");
+  Register<cPopulationEventprint_variance_data>("print_variance_data");
+  Register<cPopulationEventprint_dominant_data>("print_dominant_data");
+  Register<cPopulationEventprint_stats_data>("print_stats_data");
+  Register<cPopulationEventprint_count_data>("print_count_data");
+  Register<cPopulationEventprint_totals_data>("print_totals_data");
+  Register<cPopulationEventprint_tasks_data>("print_tasks_data");
+  Register<cPopulationEventprint_tasks_exe_data>("print_tasks_exe_data");
+  Register<cPopulationEventprint_resource_data>("print_resource_data");
+  Register<cPopulationEventprint_time_data>("print_time_data");
+  Register<cPopulationEventprint_mutation_data>("print_mutation_data");
+  Register<cPopulationEventprint_mutation_rate_data>("print_mutation_rate_data");
+  Register<cPopulationEventprint_divide_mut_data>("print_divide_mut_data");
+  Register<cPopulationEventprint_dom_parasite_data>("print_dom_parasite_data");
+  Register<cPopulationEventprint_instruction_data>("print_instruction_data");
+  Register<cPopulationEventprint_instruction_abundance_histogram>("print_instruction_abundance_histogram");
+  Register<cPopulationEventprint_depth_histogram>("print_depth_histogram");
+  Register<cPopulationEventprint_genotype_abundance_histogram>("print_genotype_abundance_histogram");
+  Register<cPopulationEventprint_species_abundance_histogram>("print_species_abundance_histogram");
+  Register<cPopulationEventprint_lineage_totals>("print_lineage_totals");
+  Register<cPopulationEventprint_lineage_counts>("print_lineage_counts");
+  Register<cPopulationEventprint_dom>("print_dom");
+  Register<cPopulationEventparasite_debug>("parasite_debug");
+  Register<cPopulationEventprint_dom_parasite>("print_dom_parasite");
+  Register<cPopulationEventprint_genotype_map>("print_genotype_map");
+  Register<cPopulationEventprint_number_phenotypes>("print_number_phenotypes");
+  Register<cPopulationEventprint_phenotype_status>("print_phenotype_status");
+  Register<cPopulationEventsave_population>("save_population");
+  Register<cPopulationEventload_population>("load_population");
+  Register<cPopulationEventsave_clone>("save_clone");
+  Register<cPopulationEventload_clone>("load_clone");
+  Register<cPopulationEventload_dump_file>("load_dump_file");
+  Register<cPopulationEventdump_pop>("dump_pop");
+  Register<cPopulationEventprint_genotypes>("print_genotypes");
+  Register<cPopulationEventdetail_pop>("detail_pop");
+  Register<cPopulationEventdetail_sex_pop>("detail_sex_pop");
+  Register<cPopulationEventdetail_parasite_pop>("detail_parasite_pop");
+  Register<cPopulationEventdump_historic_pop>("dump_historic_pop");
+  Register<cPopulationEventdump_historic_sex_pop>("dump_historic_sex_pop");
+  Register<cPopulationEventdump_memory>("dump_memory");
+  Register<cPopulationEventinject>("inject");
+  Register<cPopulationEventinject_all>("inject_all");
+  Register<cPopulationEventinject_range>("inject_range");
+  Register<cPopulationEventinject_sequence>("inject_sequence");
+  Register<cPopulationEventinject_random>("inject_random");
+  Register<cPopulationEventinject_range_parasite>("inject_range_parasite");
+  Register<cPopulationEventinject_range_pair>("inject_range_pair");
+  Register<cPopulationEventzero_muts>("zero_muts");
+  Register<cPopulationEventmod_copy_mut>("mod_copy_mut");
+  Register<cPopulationEventmod_div_mut>("mod_div_mut");
+  Register<cPopulationEventset_copy_mut>("set_copy_mut");
+  Register<cPopulationEventmod_point_mut>("mod_point_mut");
+  Register<cPopulationEventset_point_mut>("set_point_mut");
+  Register<cPopulationEventcalc_landscape>("calc_landscape");
+  Register<cPopulationEventpredict_w_landscape>("predict_w_landscape");
+  Register<cPopulationEventpredict_nu_landscape>("predict_nu_landscape");
+  Register<cPopulationEventsample_landscape>("sample_landscape");
+  Register<cPopulationEventrandom_landscape>("random_landscape");
+  Register<cPopulationEventanalyze_landscape>("analyze_landscape");
+  Register<cPopulationEventpairtest_landscape>("pairtest_landscape");
+  Register<cPopulationEventtest_dom>("test_dom");
+  Register<cPopulationEventanalyze_population>("analyze_population");
+  Register<cPopulationEventprint_detailed_fitness_data>("print_detailed_fitness_data");
+  Register<cPopulationEventprint_genetic_distance_data>("print_genetic_distance_data");
+  Register<cPopulationEventgenetic_distance_pop_dump>("genetic_distance_pop_dump");
+  Register<cPopulationEventtask_snapshot>("task_snapshot");
+  Register<cPopulationEventprint_viable_tasks_data>("print_viable_tasks_data");
+  Register<cPopulationEventapocalypse>("apocalypse");
+  Register<cPopulationEventkill_rectangle>("kill_rectangle");
+  Register<cPopulationEventrate_kill>("rate_kill");
+  Register<cPopulationEventserial_transfer>("serial_transfer");
+  Register<cPopulationEventhillclimb>("hillclimb");
+  Register<cPopulationEventhillclimb_neut>("hillclimb_neut");
+  Register<cPopulationEventhillclimb_rand>("hillclimb_rand");
+  Register<cPopulationEventcompete_demes>("compete_demes");
+  Register<cPopulationEventreset_demes>("reset_demes");
+  Register<cPopulationEventprint_deme_stats>("print_deme_stats");
+  Register<cPopulationEventcopy_deme>("copy_deme");
+  Register<cPopulationEventcalc_consensus>("calc_consensus");
+  Register<cPopulationEventtest_size_change_robustness>("test_size_change_robustness");
+  Register<cPopulationEventtest_threads>("test_threads");
+  Register<cPopulationEventprint_threads>("print_threads");
+  Register<cPopulationEventdump_fitness_grid>("dump_fitness_grid");
+  Register<cPopulationEventdump_genotype_grid>("dump_genotype_grid");
+  Register<cPopulationEventdump_task_grid>("dump_task_grid");
+  Register<cPopulationEventdump_donor_grid>("dump_donor_grid");
+  Register<cPopulationEventdump_receiver_grid>("dump_receiver_grid");
+  Register<cPopulationEventprint_tree_depths>("print_tree_depths");
+  Register<cPopulationEventsever_grid_col>("sever_grid_col");
+  Register<cPopulationEventsever_grid_row>("sever_grid_row");
+  Register<cPopulationEventjoin_grid_col>("join_grid_col");
+  Register<cPopulationEventjoin_grid_row>("join_grid_row");
+  Register<cPopulationEventconnect_cells>("connect_cells");
+  Register<cPopulationEventdisconnect_cells>("disconnect_cells");
+  Register<cPopulationEventinject_resource>("inject_resource");
+  Register<cPopulationEventset_resource>("set_resource");
+  Register<cPopulationEventinject_scaled_resource>("inject_scaled_resource");
+  Register<cPopulationEventoutflow_scaled_resource>("outflow_scaled_resource");
+  Register<cPopulationEventset_reaction_value>("set_reaction_value");
+  Register<cPopulationEventset_reaction_value_mult>("set_reaction_value_mult");
+  //return cPopulationEventFactory::EVENT_undefined;
 }
-
-cPopulationEventFactory::~cPopulationEventFactory()
-{
-}
-
-//******* construction of events **********//
-cEvent *
-cPopulationEventFactory::ConstructEvent( int event_enum,
-				    const cString & arg_list )
-{
-  cPopulationEvent *event = NULL;
-
-  switch (event_enum){
-
-    case cPopulationEventFactory::EVENT_exit :
-      event = new cPopulationEventexit(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_exit_if_generation_greater_than :
-      event = new cPopulationEventexit_if_generation_greater_than(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_exit_if_update_greater_than :
-      event = new cPopulationEventexit_if_update_greater_than(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_exit_if_ave_lineage_label_smaller :
-      event = new cPopulationEventexit_if_ave_lineage_label_smaller(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_exit_if_ave_lineage_label_larger :
-      event = new cPopulationEventexit_if_ave_lineage_label_larger(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_echo :
-      event = new cPopulationEventecho(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_data :
-      event = new cPopulationEventprint_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_average_data :
-      event = new cPopulationEventprint_average_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_error_data :
-      event = new cPopulationEventprint_error_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_variance_data :
-      event = new cPopulationEventprint_variance_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_dominant_data :
-      event = new cPopulationEventprint_dominant_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_stats_data :
-      event = new cPopulationEventprint_stats_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_count_data :
-      event = new cPopulationEventprint_count_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_totals_data :
-      event = new cPopulationEventprint_totals_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_tasks_data :
-      event = new cPopulationEventprint_tasks_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_tasks_exe_data :
-      event = new cPopulationEventprint_tasks_exe_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_resource_data :
-      event = new cPopulationEventprint_resource_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_time_data :
-      event = new cPopulationEventprint_time_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_mutation_data :
-      event = new cPopulationEventprint_mutation_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_mutation_rate_data :
-      event = new cPopulationEventprint_mutation_rate_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_divide_mut_data :
-      event = new cPopulationEventprint_divide_mut_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_dom_parasite_data :
-      event = new cPopulationEventprint_dom_parasite_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_instruction_data :
-      event = new cPopulationEventprint_instruction_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_instruction_abundance_histogram :
-      event = new cPopulationEventprint_instruction_abundance_histogram(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_depth_histogram :
-      event = new cPopulationEventprint_depth_histogram(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_genotype_abundance_histogram :
-      event = new cPopulationEventprint_genotype_abundance_histogram(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_species_abundance_histogram :
-      event = new cPopulationEventprint_species_abundance_histogram(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_lineage_totals :
-      event = new cPopulationEventprint_lineage_totals(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_lineage_counts :
-      event = new cPopulationEventprint_lineage_counts(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_dom :
-      event = new cPopulationEventprint_dom(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_parasite_debug :
-      event = new cPopulationEventparasite_debug(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_dom_parasite :
-      event = new cPopulationEventprint_dom_parasite(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_genotype_map :
-      event = new cPopulationEventprint_genotype_map(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_number_phenotypes :
-      event = new cPopulationEventprint_number_phenotypes(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_phenotype_status :
-      event = new cPopulationEventprint_phenotype_status(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_save_population :
-      event = new cPopulationEventsave_population(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_load_population :
-      event = new cPopulationEventload_population(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_save_clone :
-      event = new cPopulationEventsave_clone(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_load_clone :
-      event = new cPopulationEventload_clone(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_load_dump_file :
-      event = new cPopulationEventload_dump_file(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_pop :
-      event = new cPopulationEventdump_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_genotypes :
-      event = new cPopulationEventprint_genotypes(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_detail_pop :
-      event = new cPopulationEventdetail_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_detail_sex_pop :
-      event = new cPopulationEventdetail_sex_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_detail_parasite_pop :
-      event = new cPopulationEventdetail_parasite_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_historic_pop :
-      event = new cPopulationEventdump_historic_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_historic_sex_pop :
-      event = new cPopulationEventdump_historic_sex_pop(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_memory :
-      event = new cPopulationEventdump_memory(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject :
-      event = new cPopulationEventinject(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_all :
-      event = new cPopulationEventinject_all(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_range :
-      event = new cPopulationEventinject_range(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_sequence :
-      event = new cPopulationEventinject_sequence(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_random :
-      event = new cPopulationEventinject_random(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_range_parasite :
-      event = new cPopulationEventinject_range_parasite(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_range_pair :
-      event = new cPopulationEventinject_range_pair(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_zero_muts :
-      event = new cPopulationEventzero_muts(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_mod_copy_mut :
-      event = new cPopulationEventmod_copy_mut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_mod_div_mut :
-      event = new cPopulationEventmod_div_mut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_set_copy_mut :
-      event = new cPopulationEventset_copy_mut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_mod_point_mut :
-      event = new cPopulationEventmod_point_mut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_set_point_mut :
-      event = new cPopulationEventset_point_mut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_calc_landscape :
-      event = new cPopulationEventcalc_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_predict_w_landscape :
-      event = new cPopulationEventpredict_w_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_predict_nu_landscape :
-      event = new cPopulationEventpredict_nu_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_sample_landscape :
-      event = new cPopulationEventsample_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_random_landscape :
-      event = new cPopulationEventrandom_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_analyze_landscape :
-      event = new cPopulationEventanalyze_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_pairtest_landscape :
-      event = new cPopulationEventpairtest_landscape(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_test_dom :
-      event = new cPopulationEventtest_dom(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_analyze_population :
-      event = new cPopulationEventanalyze_population(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_detailed_fitness_data :
-      event = new cPopulationEventprint_detailed_fitness_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_genetic_distance_data :
-      event = new cPopulationEventprint_genetic_distance_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_genetic_distance_pop_dump :
-      event = new cPopulationEventgenetic_distance_pop_dump(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_task_snapshot :
-      event = new cPopulationEventtask_snapshot(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_viable_tasks_data :
-      event = new cPopulationEventprint_viable_tasks_data(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_apocalypse :
-      event = new cPopulationEventapocalypse(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_kill_rectangle :
-      event = new cPopulationEventkill_rectangle(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_rate_kill :
-      event = new cPopulationEventrate_kill(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_serial_transfer :
-      event = new cPopulationEventserial_transfer(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_hillclimb :
-      event = new cPopulationEventhillclimb(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_hillclimb_neut :
-      event = new cPopulationEventhillclimb_neut(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_hillclimb_rand :
-      event = new cPopulationEventhillclimb_rand(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_compete_demes :
-      event = new cPopulationEventcompete_demes(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_reset_demes :
-      event = new cPopulationEventreset_demes(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_deme_stats :
-      event = new cPopulationEventprint_deme_stats(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_copy_deme :
-      event = new cPopulationEventcopy_deme(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_calc_consensus :
-      event = new cPopulationEventcalc_consensus(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_test_size_change_robustness :
-      event = new cPopulationEventtest_size_change_robustness(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_test_threads :
-      event = new cPopulationEventtest_threads(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_threads :
-      event = new cPopulationEventprint_threads(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_fitness_grid :
-      event = new cPopulationEventdump_fitness_grid(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_genotype_grid :
-      event = new cPopulationEventdump_genotype_grid(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_task_grid :
-      event = new cPopulationEventdump_task_grid(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_donor_grid :
-      event = new cPopulationEventdump_donor_grid(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_dump_receiver_grid :
-      event = new cPopulationEventdump_receiver_grid(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_print_tree_depths :
-      event = new cPopulationEventprint_tree_depths(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_sever_grid_col :
-      event = new cPopulationEventsever_grid_col(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_sever_grid_row :
-      event = new cPopulationEventsever_grid_row(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_join_grid_col :
-      event = new cPopulationEventjoin_grid_col(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_join_grid_row :
-      event = new cPopulationEventjoin_grid_row(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_connect_cells :
-      event = new cPopulationEventconnect_cells(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_disconnect_cells :
-      event = new cPopulationEventdisconnect_cells(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_resource :
-      event = new cPopulationEventinject_resource(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_set_resource :
-      event = new cPopulationEventset_resource(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_inject_scaled_resource :
-      event = new cPopulationEventinject_scaled_resource(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_outflow_scaled_resource :
-      event = new cPopulationEventoutflow_scaled_resource(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_set_reaction_value :
-      event = new cPopulationEventset_reaction_value(arg_list);
-      break;
-    case cPopulationEventFactory::EVENT_set_reaction_value_mult :
-      event = new cPopulationEventset_reaction_value_mult(arg_list);
-      break;
-      
-    default:
-      event = NULL;
-      break;
-  }
-
-  if( event != NULL ){
-    // Have to setup the base class variables
-    event->SetFactoryId( GetFactoryId() );
-
-    assert( m_population != NULL );
-    event->SetPopulation( m_population );
-  }
-  return event;
-}
-
-
-
-

Modified: branches/brysonda/source/event/population_event_factory.hh
===================================================================
--- branches/brysonda/source/event/population_event_factory.hh	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/event/population_event_factory.hh	2005-06-10 19:24:15 UTC (rev 201)
@@ -8,135 +8,35 @@
 #ifndef POPULATION_EVENT_FACTORY_HH
 #define POPULATION_EVENT_FACTORY_HH
 
-#ifndef EVENT_FACTORY_HH
-#include "event_factory.hh"
+#ifndef TOBJECTFACTORY_H
+#include "tObjectFactory.h"
 #endif
 
-class cEvent;
+#ifndef POPULATION_EVENT_HH
+#include "population_event.hh"
+#endif
+
 class cPopulation;
 class cString;
 
-class cPopulationEventFactory : public cEventFactory {
+class cPopulationEventFactory : public tObjectFactory<cEvent, const cString&> {
 private:
   cPopulation *m_population;
-public:
-  // event enums
-  enum eEvent { EVENT_undefined = 0,
-    EVENT_exit,
-    EVENT_exit_if_generation_greater_than,
-    EVENT_exit_if_update_greater_than,
-    EVENT_exit_if_ave_lineage_label_smaller,
-    EVENT_exit_if_ave_lineage_label_larger,
-    EVENT_echo,
-    EVENT_print_data,
-    EVENT_print_average_data,
-    EVENT_print_error_data,
-    EVENT_print_variance_data,
-    EVENT_print_dominant_data,
-    EVENT_print_stats_data,
-    EVENT_print_count_data,
-    EVENT_print_totals_data,
-    EVENT_print_tasks_data,
-    EVENT_print_tasks_exe_data,
-    EVENT_print_resource_data,
-    EVENT_print_time_data,
-    EVENT_print_mutation_data,
-    EVENT_print_mutation_rate_data,
-    EVENT_print_divide_mut_data,
-    EVENT_print_dom_parasite_data,
-    EVENT_print_instruction_data,
-    EVENT_print_instruction_abundance_histogram,
-    EVENT_print_depth_histogram,
-    EVENT_print_genotype_abundance_histogram,
-    EVENT_print_species_abundance_histogram,
-    EVENT_print_lineage_totals,
-    EVENT_print_lineage_counts,
-    EVENT_print_dom,
-    EVENT_parasite_debug,
-    EVENT_print_dom_parasite,
-    EVENT_print_genotype_map,
-    EVENT_print_number_phenotypes,
-    EVENT_print_phenotype_status,
-    EVENT_save_population,
-    EVENT_load_population,
-    EVENT_save_clone,
-    EVENT_load_clone,
-    EVENT_load_dump_file,
-    EVENT_dump_pop,
-    EVENT_print_genotypes,
-    EVENT_detail_pop,
-    EVENT_detail_sex_pop,
-    EVENT_detail_parasite_pop,
-    EVENT_dump_historic_pop,
-    EVENT_dump_historic_sex_pop,
-    EVENT_dump_memory,
-    EVENT_inject,
-    EVENT_inject_all,
-    EVENT_inject_range,
-    EVENT_inject_sequence,
-    EVENT_inject_random,
-    EVENT_inject_range_parasite,
-    EVENT_inject_range_pair,
-    EVENT_zero_muts,
-    EVENT_mod_copy_mut,
-    EVENT_mod_div_mut,
-    EVENT_set_copy_mut,
-    EVENT_mod_point_mut,
-    EVENT_set_point_mut,
-    EVENT_calc_landscape,
-    EVENT_predict_w_landscape,
-    EVENT_predict_nu_landscape,
-    EVENT_sample_landscape,
-    EVENT_random_landscape,
-    EVENT_analyze_landscape,
-    EVENT_pairtest_landscape,
-    EVENT_test_dom,
-    EVENT_analyze_population,
-    EVENT_print_detailed_fitness_data,
-    EVENT_print_genetic_distance_data,
-    EVENT_genetic_distance_pop_dump,
-    EVENT_task_snapshot,
-    EVENT_print_viable_tasks_data,
-    EVENT_apocalypse,
-    EVENT_kill_rectangle,
-    EVENT_rate_kill,
-    EVENT_serial_transfer,
-    EVENT_hillclimb,
-    EVENT_hillclimb_neut,
-    EVENT_hillclimb_rand,
-    EVENT_compete_demes,
-    EVENT_reset_demes,
-    EVENT_print_deme_stats,
-    EVENT_copy_deme,
-    EVENT_calc_consensus,
-    EVENT_test_size_change_robustness,
-    EVENT_test_threads,
-    EVENT_print_threads,
-    EVENT_dump_fitness_grid,
-    EVENT_dump_genotype_grid,
-    EVENT_dump_task_grid,
-    EVENT_dump_donor_grid,
-    EVENT_dump_receiver_grid,
-    EVENT_print_tree_depths,
-    EVENT_sever_grid_col,
-    EVENT_sever_grid_row,
-    EVENT_join_grid_col,
-    EVENT_join_grid_row,
-    EVENT_connect_cells,
-    EVENT_disconnect_cells,
-    EVENT_inject_resource,
-    EVENT_set_resource,
-    EVENT_inject_scaled_resource,
-    EVENT_outflow_scaled_resource,
-    EVENT_set_reaction_value,
-    EVENT_set_reaction_value_mult,
-    EVENT_NO_EVENT };
-  
-  cPopulationEventFactory( cPopulation *pop );
-  ~cPopulationEventFactory();
+public:  
+  cPopulationEventFactory(cPopulation* pop);
+  ~cPopulationEventFactory() { ; }
 
-  int EventNameToEnum(const cString & name) const;
-  cEvent * ConstructEvent(int event_enum, const cString & args );
+  cEvent* Create(const cString& key, const cString& arg)
+  {
+    cPopulationEvent* event = static_cast<cPopulationEvent*>(this->tObjectFactory<cEvent, const cString&>::Create(key, arg));
+    if( event != NULL ){
+      event->SetFactoryId( GetFactoryId() );
+      
+      assert( m_population != NULL );
+      event->SetPopulation( m_population );
+    }
+    return event;
+  }
 };
 
 #endif

Modified: branches/brysonda/source/main/inst_lib_base.hh
===================================================================
--- branches/brysonda/source/main/inst_lib_base.hh	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/main/inst_lib_base.hh	2005-06-10 19:24:15 UTC (rev 201)
@@ -15,6 +15,7 @@
 class cString;
 class cInstLibBase {
 public:
+  virtual ~cInstLibBase() { ; }
   virtual const cString &GetName(const unsigned int id) = 0;
   virtual const cString &GetNopName(const unsigned int id) = 0;
   virtual int GetNopMod(const unsigned int id) = 0;

Added: branches/brysonda/source/tools/tObjectFactory.h
===================================================================
--- branches/brysonda/source/tools/tObjectFactory.h	2005-06-10 17:42:45 UTC (rev 200)
+++ branches/brysonda/source/tools/tObjectFactory.h	2005-06-10 19:24:15 UTC (rev 201)
@@ -0,0 +1,68 @@
+/*
+ *  tObjectFactory.h
+ *  Avida2
+ *
+ *  Created by David on 6/10/05.
+ *  Copyright 2005 Michigan State University. All rights reserved.
+ *
+ */
+
+#ifndef TOBJECTFACTORY_H
+#define TOBJECTFACTORY_H
+
+#ifndef TDICTIONARY_HH
+#include "tDictionary.hh"
+#endif
+
+class cString;
+
+namespace nObjectFactory
+{
+  template<typename BaseType, typename ClassType, typename ArgType>
+  BaseType* createObject(const cString& key, ArgType arg)
+  {
+    return new ClassType(key, arg);
+  }
+}
+
+template<typename BaseType, typename ArgType>
+class tObjectFactory
+{
+protected:
+  typedef BaseType* (*CreateObjectFunction)(const cString&, ArgType);
+  
+  tDictionary<CreateObjectFunction> m_create_funcs;
+  int m_factory_id;
+  
+public:
+    tObjectFactory() : m_factory_id(0) { ; }
+  virtual ~tObjectFactory() { ; }
+  
+  void SetFactoryId(int id) { m_factory_id = id; }
+  int GetFactoryId() { return m_factory_id; }
+
+  template<typename ClassType> bool Register(const cString& key)
+  {
+    CreateObjectFunction func;
+    if (m_create_funcs.Find(key, func)) return false;
+    
+    m_create_funcs.Add(key, &nObjectFactory::createObject<BaseType, ClassType, ArgType>);
+    return true;
+  }
+  
+  bool Unregister(const cString& key)
+  {
+    return (m_create_funcs.Remove(key) != NULL);
+  }
+  
+  virtual BaseType* Create(const cString& key, ArgType arg)
+  {
+    CreateObjectFunction func;
+    if (m_create_funcs.Find(key, func))
+      return func(key, arg);
+    
+    return NULL;
+  }
+};
+
+#endif




More information about the Avida-cvs mailing list