Index: src/Parser/RunParser.cpp
===================================================================
--- src/Parser/RunParser.cpp	(revision d3bffdb44dc9b6dbed0d613d5d7990a08d470a70)
+++ src/Parser/RunParser.cpp	(revision f2f595d7b09602384f8e7020925200192dcb3825)
@@ -10,6 +10,6 @@
 // Created On       : Mon Dec 19 11:00:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:18:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -24,9 +24,9 @@
 
 // Variables global to the parsing code.
-LinkageSpec::Spec linkage = LinkageSpec::Cforall;
+ast::Linkage::Spec linkage = ast::Linkage::Cforall;
 TypedefTable typedefTable;
 DeclarationNode * parseTree = nullptr;
 
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit ) {
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit ) {
 	extern int yyparse( void );
 	extern FILE * yyin;
Index: src/Parser/RunParser.hpp
===================================================================
--- src/Parser/RunParser.hpp	(revision d3bffdb44dc9b6dbed0d613d5d7990a08d470a70)
+++ src/Parser/RunParser.hpp	(revision f2f595d7b09602384f8e7020925200192dcb3825)
@@ -10,6 +10,6 @@
 // Created On       : Mon Dec 19 10:42:00 2022
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Dec 22 10:23:00 2022
-// Update Count     : 1
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 2
 //
 
@@ -18,5 +18,5 @@
 #include <iosfwd>                           // for ostream
 
-#include "SynTree/LinkageSpec.h"            // for Spec
+#include "AST/LinkageSpec.hpp"              // for Spec
 namespace ast {
 	class TranslationUnit;
@@ -29,5 +29,5 @@
 /// The input file is closed when complete. Exits instead of returning on
 /// error or if alwaysExit is true.
-void parse( FILE * input, LinkageSpec::Spec linkage, bool alwaysExit = false );
+void parse( FILE * input, ast::Linkage::Spec linkage, bool alwaysExit = false );
 
 /// Drain the internal accumulator of parsed code and build a translation
Index: src/main.cc
===================================================================
--- src/main.cc	(revision d3bffdb44dc9b6dbed0d613d5d7990a08d470a70)
+++ src/main.cc	(revision f2f595d7b09602384f8e7020925200192dcb3825)
@@ -10,6 +10,6 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Oct  5 12:06:00 2022
-// Update Count     : 679
+// Last Modified On : Thr Feb 16 10:08:00 2023
+// Update Count     : 680
 //
 
@@ -272,10 +272,10 @@
 			FILE * gcc_builtins = fopen( (PreludeDirector + "/gcc-builtins.cf").c_str(), "r" );
 			assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
-			parse( gcc_builtins, LinkageSpec::Compiler );
+			parse( gcc_builtins, ast::Linkage::Compiler );
 
 			// read the extra prelude in, if not generating the cfa library
 			FILE * extras = fopen( (PreludeDirector + "/extras.cf").c_str(), "r" );
 			assertf( extras, "cannot open extras.cf\n" );
-			parse( extras, LinkageSpec::BuiltinC );
+			parse( extras, ast::Linkage::BuiltinC );
 
 			if ( ! libcfap ) {
@@ -283,14 +283,14 @@
 				FILE * prelude = fopen( (PreludeDirector + "/prelude.cfa").c_str(), "r" );
 				assertf( prelude, "cannot open prelude.cfa\n" );
-				parse( prelude, LinkageSpec::Intrinsic );
+				parse( prelude, ast::Linkage::Intrinsic );
 
 				// Read to cfa builtins, if not generating the cfa library
 				FILE * builtins = fopen( (PreludeDirector + "/builtins.cf").c_str(), "r" );
 				assertf( builtins, "cannot open builtins.cf\n" );
-				parse( builtins, LinkageSpec::BuiltinCFA );
-			} // if
-		} // if
-
-		parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, yydebug );
+				parse( builtins, ast::Linkage::BuiltinCFA );
+			} // if
+		} // if
+
+		parse( input, libcfap ? ast::Linkage::Intrinsic : ast::Linkage::Cforall, yydebug );
 
 		transUnit = buildUnit();
@@ -340,6 +340,5 @@
 		PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
 
-        PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
-
+		PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
 		PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
 		PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );