diff --git a/Makefile b/Makefile
index fc2a38808..9190c6a11 100644
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,31 @@ else
   endif
 endif
 
-all: build
-
-dist/setup-config: gf.cabal Setup.hs WebSetup.hs
-ifneq ($(STACK),1)
-	cabal ${CMD_PFX}configure
-endif
-
-build: dist/setup-config
-	${CMD} ${CMD_PFX}build
-
-install:
+all: src/runtime/c/libpgf.la src/runtime/haskell/dist/setup-config src/compiler/dist/setup-config
 ifeq ($(STACK),1)
 	stack install
 else
-	cabal ${CMD_PFX}copy
-	cabal ${CMD_PFX}register
+	(cd src/runtime/haskell; ${CMD} ${CMD_PFX}install)
+	(cd src/compiler; ${CMD} ${CMD_PFX}install)
+endif
+
+src/runtime/c/libpgf.la: src/runtime/c/Makefile
+	(cd src/runtime/c; make; sudo make install)
+
+src/runtime/c/Makefile: src/runtime/c/Makefile.in src/runtime/c/configure
+	(cd src/runtime/c; ./configure)
+
+src/runtime/c/Makefile.in src/runtime/c/configure: src/runtime/c/configure.ac src/runtime/c/Makefile.am
+	(cd src/runtime/c; autoreconf -i)
+
+src/runtime/haskell/dist/setup-config: src/runtime/c/libpgf.la src/runtime/haskell/pgf2.cabal
+ifneq ($(STACK),1)
+	(cd src/runtime/haskell; cabal ${CMD_PFX}configure)
+endif
+
+src/compiler/dist/setup-config: src/compiler/gf.cabal src/compiler/Setup.hs src/compiler/WebSetup.hs
+ifneq ($(STACK),1)
+	(cd src/compiler; cabal ${CMD_PFX}configure)
 endif
 
 doc:
diff --git a/src/server/Cache.hs b/src/compiler/GF/Infra/Cache.hs
similarity index 96%
rename from src/server/Cache.hs
rename to src/compiler/GF/Infra/Cache.hs
index 85c84df36..c40f6f0f0 100644
--- a/src/server/Cache.hs
+++ b/src/compiler/GF/Infra/Cache.hs
@@ -1,5 +1,5 @@
 -- | A file cache to avoid reading and parsing the same file many times
-module Cache (Cache,newCache,flushCache,expireCache,listCache,readCache,readCache') where
+module GF.Infra.Cache (Cache,newCache,flushCache,expireCache,listCache,readCache,readCache') where
 
 import Control.Concurrent.MVar
 import Data.Map (Map)
diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs
index c5d0fbda5..8c468003c 100644
--- a/src/compiler/GF/Server.hs
+++ b/src/compiler/GF/Server.hs
@@ -32,7 +32,7 @@ import Network.URI(URI(..))
 import Network.Shed.Httpd(initServer,Request(..),Response(..),noCache)
 --import qualified Network.FastCGI as FCGI -- from hackage direct-fastcgi
 import Network.CGI(handleErrors,liftIO)
-import CGIUtils(handleCGIErrors)--,outputJSONP,stderrToFile
+import GF.Server.CGIUtils(handleCGIErrors)--,outputJSONP,stderrToFile
 import Text.JSON(encode,showJSON,makeObj)
 --import System.IO.Silently(hCapture)
 import System.Process(readProcessWithExitCode)
@@ -41,13 +41,13 @@ import Codec.Binary.UTF8.String(decodeString,encodeString)
 import GF.Infra.UseIO(readBinaryFile,writeBinaryFile,ePutStrLn)
 import GF.Infra.SIO(captureSIO)
 import GF.Data.Utilities(apSnd,mapSnd)
-import qualified PGFService as PS
+import qualified GF.Server.PGFService as PS
 import Data.Version(showVersion)
 import Paths_gf(getDataDir,version)
 import GF.Infra.BuildInfo (buildInfo)
-import SimpleEditor.Convert(parseModule)
-import RunHTTP(cgiHandler)
-import URLEncoding(decodeQuery)
+import GF.Server.SimpleEditor.Convert(parseModule)
+import GF.Server.RunHTTP(cgiHandler)
+import GF.Server.URLEncoding(decodeQuery)
 
 --logFile :: FilePath
 --logFile = "pgf-error.log"
diff --git a/src/server/CGI.hs b/src/compiler/GF/Server/CGI.hs
similarity index 92%
rename from src/server/CGI.hs
rename to src/compiler/GF/Server/CGI.hs
index 821f93b9c..36455c3c6 100644
--- a/src/server/CGI.hs
+++ b/src/compiler/GF/Server/CGI.hs
@@ -1,5 +1,5 @@
 -- | Isolate dependencies on the problematic cgi package to this module
-module CGI(module C) where
+module GF.Server.CGI(module C) where
 import Network.CGI as C(
        CGI,ContentType(..),Accept(..),Language(..),
        getVarWithDefault,readInput,negotiate,requestAcceptLanguage,getInput,
diff --git a/src/server/CGIUtils.hs b/src/compiler/GF/Server/CGIUtils.hs
similarity index 88%
rename from src/server/CGIUtils.hs
rename to src/compiler/GF/Server/CGIUtils.hs
index 3c5ce2274..07981a717 100644
--- a/src/server/CGIUtils.hs
+++ b/src/compiler/GF/Server/CGIUtils.hs
@@ -1,10 +1,10 @@
 {-# LANGUAGE DeriveDataTypeable, CPP #-}
 -- | CGI utility functions for output, error handling and logging
-module CGIUtils (throwCGIError, handleCGIErrors,
-                 stderrToFile,logError,
-                 outputJSONP,outputEncodedJSONP,
-                 outputPNG,outputBinary,outputBinary',
-                 outputHTML,outputPlain,outputText) where
+module GF.Server.CGIUtils (throwCGIError, handleCGIErrors,
+                           stderrToFile,logError,
+                           outputJSONP,outputEncodedJSONP,
+                           outputPNG,outputBinary,outputBinary',
+                           outputHTML,outputPlain,outputText) where
 
 import Control.Exception(Exception(..),SomeException(..),throw)
 import Data.Typeable(Typeable,cast)
@@ -14,8 +14,8 @@ import System.IO(hPutStrLn,stderr)
 import System.Posix
 #endif
 
-import CGI(CGI,CGIResult,setHeader,output,outputFPS,outputError,
-           getInput)
+import GF.Server.CGI(CGI,CGIResult,setHeader,output,outputFPS,outputError,
+                     getInput)
 
 import Text.JSON
 import qualified Codec.Binary.UTF8.String as UTF8 (encodeString)
diff --git a/src/server/LICENSE b/src/compiler/GF/Server/LICENSE
similarity index 100%
rename from src/server/LICENSE
rename to src/compiler/GF/Server/LICENSE
diff --git a/src/server/PGFService.hs b/src/compiler/GF/Server/PGFService.hs
similarity index 96%
rename from src/server/PGFService.hs
rename to src/compiler/GF/Server/PGFService.hs
index 2ed24b390..3e2d2ef41 100644
--- a/src/server/PGFService.hs
+++ b/src/compiler/GF/Server/PGFService.hs
@@ -1,19 +1,19 @@
 {-# LANGUAGE CPP #-}
-module PGFService(cgiMain,cgiMain',getPath,
-                  logFile,stderrToFile,
-                  Caches,pgfCache,newPGFCache,flushPGFCache,listPGFCache) where
+module GF.Server.PGFService(cgiMain,cgiMain',getPath,
+                            logFile,stderrToFile,
+                            Caches,pgfCache,newPGFCache,flushPGFCache,listPGFCache) where
 
 import PGF2
 import PGF2.Transactions
 import GF.Text.Lexing
-import Cache
-import CGIUtils(outputJSONP,outputPlain,outputHTML,outputText,
-                outputBinary,outputBinary',
-                logError,handleCGIErrors,throwCGIError,stderrToFile)
-import CGI(CGI,readInput,getInput,getVarWithDefault,
-           CGIResult,requestAcceptLanguage,handleErrors,setHeader,
-           Accept(..),Language(..),negotiate,liftIO)
-import URLEncoding
+import GF.Infra.Cache
+import GF.Server.CGIUtils(outputJSONP,outputPlain,outputHTML,outputText,
+                          outputBinary,outputBinary',
+                          logError,handleCGIErrors,throwCGIError,stderrToFile)
+import GF.Server.CGI(CGI,readInput,getInput,getVarWithDefault,
+                     CGIResult,requestAcceptLanguage,handleErrors,setHeader,
+                     Accept(..),Language(..),negotiate,liftIO)
+import GF.Server.URLEncoding
 
 import Data.Time.Clock(UTCTime)
 import Data.Time.Format(formatTime)
diff --git a/src/server/RunHTTP.hs b/src/compiler/GF/Server/RunHTTP.hs
similarity index 84%
rename from src/server/RunHTTP.hs
rename to src/compiler/GF/Server/RunHTTP.hs
index 7a46e57ba..09e338ae4 100644
--- a/src/server/RunHTTP.hs
+++ b/src/compiler/GF/Server/RunHTTP.hs
@@ -1,13 +1,14 @@
-module RunHTTP(runHTTP,Options(..),cgiHandler) where
+module GF.Server.RunHTTP(runHTTP,Options(..),cgiHandler) where
+
+import GF.Server.CGI(ContentType(..),
+                     CGIResult(..),CGIRequest(..),Input(..),
+                     Headers,HeaderName(..),
+                     runCGIT)
+import GF.Server.URLEncoding(decodeQuery)
 import Network.URI(uriPath,uriQuery)
-import CGI(ContentType(..))
-import CGI(CGIResult(..),CGIRequest(..),Input(..),
-                            Headers,HeaderName(..))
-import CGI(runCGIT)
 import Network.Shed.Httpd(initServer,Request(..),Response(..))
 import qualified Data.ByteString.Lazy.Char8 as BS(pack,unpack,empty)
 import qualified Data.Map as M(fromList)
-import URLEncoding(decodeQuery)
 
 data Options = Options { documentRoot :: String, port :: Int } deriving Show
 
diff --git a/src/server/ServeStaticFile.hs b/src/compiler/GF/Server/ServeStaticFile.hs
similarity index 100%
rename from src/server/ServeStaticFile.hs
rename to src/compiler/GF/Server/ServeStaticFile.hs
diff --git a/src/server/Setup.hs b/src/compiler/GF/Server/Setup.hs
similarity index 100%
rename from src/server/Setup.hs
rename to src/compiler/GF/Server/Setup.hs
diff --git a/src/compiler/SimpleEditor/Convert.hs b/src/compiler/GF/Server/SimpleEditor/Convert.hs
similarity index 97%
rename from src/compiler/SimpleEditor/Convert.hs
rename to src/compiler/GF/Server/SimpleEditor/Convert.hs
index 95a3359b1..04b8f8876 100644
--- a/src/compiler/SimpleEditor/Convert.hs
+++ b/src/compiler/GF/Server/SimpleEditor/Convert.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE NoMonomorphismRestriction #-}
-module SimpleEditor.Convert where
+module GF.Server.SimpleEditor.Convert where
 
 import Control.Monad(unless,foldM,ap,mplus)
 import Data.List(sortBy)
@@ -19,8 +19,8 @@ import GF.Grammar.Lexer(Posn(..))
 import GF.Data.ErrM
 import PGF2(Literal(LStr))
 
-import SimpleEditor.Syntax as S
-import SimpleEditor.JSON
+import GF.Server.SimpleEditor.Syntax as S
+import GF.Server.SimpleEditor.JSON
 
 
 parseModule (path,source) =
diff --git a/src/compiler/SimpleEditor/JSON.hs b/src/compiler/GF/Server/SimpleEditor/JSON.hs
similarity index 95%
rename from src/compiler/SimpleEditor/JSON.hs
rename to src/compiler/GF/Server/SimpleEditor/JSON.hs
index 06586c5eb..d9642bc6d 100644
--- a/src/compiler/SimpleEditor/JSON.hs
+++ b/src/compiler/GF/Server/SimpleEditor/JSON.hs
@@ -1,8 +1,8 @@
-module SimpleEditor.JSON where
+module GF.Server.SimpleEditor.JSON where
 
 import Text.JSON
 
-import SimpleEditor.Syntax
+import GF.Server.SimpleEditor.Syntax
 
 
 instance JSON Grammar where
diff --git a/src/compiler/SimpleEditor/Syntax.hs b/src/compiler/GF/Server/SimpleEditor/Syntax.hs
similarity index 97%
rename from src/compiler/SimpleEditor/Syntax.hs
rename to src/compiler/GF/Server/SimpleEditor/Syntax.hs
index 8280ed461..890cf1cca 100644
--- a/src/compiler/SimpleEditor/Syntax.hs
+++ b/src/compiler/GF/Server/SimpleEditor/Syntax.hs
@@ -2,7 +2,7 @@
 Abstract syntax for the small subset of GF grammars supported
 in gfse, the JavaScript-based simple grammar editor.
 -}
-module SimpleEditor.Syntax where
+module GF.Server.SimpleEditor.Syntax where
 
 type Id    = String -- all sorts of identifiers
 type ModId = Id -- module name
diff --git a/src/server/URLEncoding.hs b/src/compiler/GF/Server/URLEncoding.hs
similarity index 96%
rename from src/server/URLEncoding.hs
rename to src/compiler/GF/Server/URLEncoding.hs
index 1a8f579b2..ac9f75a21 100644
--- a/src/server/URLEncoding.hs
+++ b/src/compiler/GF/Server/URLEncoding.hs
@@ -1,4 +1,4 @@
-module URLEncoding(urlDecodeUnicode,decodeQuery) where
+module GF.Server.URLEncoding(urlDecodeUnicode,decodeQuery) where
 
 import Data.Bits (shiftL, (.|.))
 import Data.Char (chr,digitToInt,isHexDigit)
diff --git a/src/server/exec/pgf-fcgi.hs b/src/compiler/GF/Server/exec/pgf-fcgi.hs
similarity index 100%
rename from src/server/exec/pgf-fcgi.hs
rename to src/compiler/GF/Server/exec/pgf-fcgi.hs
diff --git a/src/server/exec/pgf-http.hs b/src/compiler/GF/Server/exec/pgf-http.hs
similarity index 100%
rename from src/server/exec/pgf-http.hs
rename to src/compiler/GF/Server/exec/pgf-http.hs
diff --git a/src/server/gf-server-jsapi.js b/src/compiler/GF/Server/gf-server-jsapi.js
similarity index 100%
rename from src/server/gf-server-jsapi.js
rename to src/compiler/GF/Server/gf-server-jsapi.js
diff --git a/src/server/lighttpd.conf b/src/compiler/GF/Server/lighttpd.conf
similarity index 100%
rename from src/server/lighttpd.conf
rename to src/compiler/GF/Server/lighttpd.conf
diff --git a/src/server/simple-client.html b/src/compiler/GF/Server/simple-client.html
similarity index 100%
rename from src/server/simple-client.html
rename to src/compiler/GF/Server/simple-client.html
diff --git a/src/server/transfer/Fold.hs b/src/compiler/GF/Server/transfer/Fold.hs
similarity index 100%
rename from src/server/transfer/Fold.hs
rename to src/compiler/GF/Server/transfer/Fold.hs
diff --git a/src/server/translator.css b/src/compiler/GF/Server/translator.css
similarity index 100%
rename from src/server/translator.css
rename to src/compiler/GF/Server/translator.css
diff --git a/src/server/translator.js b/src/compiler/GF/Server/translator.js
similarity index 100%
rename from src/server/translator.js
rename to src/compiler/GF/Server/translator.js
diff --git a/LICENSE b/src/compiler/LICENSE
similarity index 100%
rename from LICENSE
rename to src/compiler/LICENSE
diff --git a/Setup.hs b/src/compiler/Setup.hs
similarity index 100%
rename from Setup.hs
rename to src/compiler/Setup.hs
diff --git a/WebSetup.hs b/src/compiler/WebSetup.hs
similarity index 98%
rename from WebSetup.hs
rename to src/compiler/WebSetup.hs
index fa8c5787f..cad4c72aa 100644
--- a/WebSetup.hs
+++ b/src/compiler/WebSetup.hs
@@ -118,7 +118,7 @@ setupWeb dest (pkg,lbi) = do
 
     copyGFLogo =
       do createDirectoryIfMissing True logo_dir
-         copyFile ("doc"</>"Logos"</>gf_logo) (logo_dir</>gf_logo)
+         copyFile (".."</>".."</>"doc"</>"Logos"</>gf_logo) (logo_dir</>gf_logo)
 
 -- | Run an arbitrary system command, returning False on failure
 execute :: String -> [String] -> IO Bool
diff --git a/src/programs/gf-main.hs b/src/compiler/gf-main.hs
similarity index 100%
rename from src/programs/gf-main.hs
rename to src/compiler/gf-main.hs
diff --git a/gf.cabal b/src/compiler/gf.cabal
similarity index 94%
rename from gf.cabal
rename to src/compiler/gf.cabal
index 04079f5d4..c2a5c5576 100644
--- a/gf.cabal
+++ b/src/compiler/gf.cabal
@@ -13,12 +13,6 @@ homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
 tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2
 
-data-dir: src
-extra-source-files:
-  README.md
-  CHANGELOG.md
-  WebSetup.hs
-  doc/Logos/gf0.png
 data-files:
   www/*.html
   www/*.css
@@ -69,7 +63,6 @@ flag network-uri
    default: True
 
 executable gf
-  hs-source-dirs: src/programs, src/compiler
   main-is: gf-main.hs
   default-language:    Haskell2010
   build-depends: pgf2,
@@ -171,6 +164,7 @@ executable gf
     GF.Infra.Ident
     GF.Infra.Location
     GF.Infra.SIO
+    GF.Infra.Cache
     GF.JavaScript.AbsJS
     GF.JavaScript.PrintJS
     GF.Quiz
@@ -232,18 +226,14 @@ executable gf
     cpp-options: -DSERVER_MODE
     other-modules:
       GF.Server
-      PGFService
-      RunHTTP
-      SimpleEditor.Convert
-      SimpleEditor.JSON
-      SimpleEditor.Syntax
-      URLEncoding
-      CGI
-      CGIUtils
-      Cache
-    hs-source-dirs:
-      src/server
-      src/server/transfer
+      GF.Server.PGFService
+      GF.Server.RunHTTP
+      GF.Server.SimpleEditor.Convert
+      GF.Server.SimpleEditor.JSON
+      GF.Server.SimpleEditor.Syntax
+      GF.Server.URLEncoding
+      GF.Server.CGI
+      GF.Server.CGIUtils
 
   if flag(interrupt)
     cpp-options: -DUSE_INTERRUPT
diff --git a/testsuite/canonical/.gitignore b/src/compiler/testsuite/canonical/.gitignore
similarity index 100%
rename from testsuite/canonical/.gitignore
rename to src/compiler/testsuite/canonical/.gitignore
diff --git a/testsuite/canonical/gold/FoodsFin.gf b/src/compiler/testsuite/canonical/gold/FoodsFin.gf
similarity index 100%
rename from testsuite/canonical/gold/FoodsFin.gf
rename to src/compiler/testsuite/canonical/gold/FoodsFin.gf
diff --git a/testsuite/canonical/gold/PhrasebookBul.gf b/src/compiler/testsuite/canonical/gold/PhrasebookBul.gf
similarity index 100%
rename from testsuite/canonical/gold/PhrasebookBul.gf
rename to src/compiler/testsuite/canonical/gold/PhrasebookBul.gf
diff --git a/testsuite/canonical/gold/PhrasebookGer.gf b/src/compiler/testsuite/canonical/gold/PhrasebookGer.gf
similarity index 100%
rename from testsuite/canonical/gold/PhrasebookGer.gf
rename to src/compiler/testsuite/canonical/gold/PhrasebookGer.gf
diff --git a/testsuite/canonical/grammars/Foods.gf b/src/compiler/testsuite/canonical/grammars/Foods.gf
similarity index 100%
rename from testsuite/canonical/grammars/Foods.gf
rename to src/compiler/testsuite/canonical/grammars/Foods.gf
diff --git a/testsuite/canonical/grammars/FoodsFin.gf b/src/compiler/testsuite/canonical/grammars/FoodsFin.gf
similarity index 100%
rename from testsuite/canonical/grammars/FoodsFin.gf
rename to src/compiler/testsuite/canonical/grammars/FoodsFin.gf
diff --git a/testsuite/canonical/grammars/FoodsI.gf b/src/compiler/testsuite/canonical/grammars/FoodsI.gf
similarity index 100%
rename from testsuite/canonical/grammars/FoodsI.gf
rename to src/compiler/testsuite/canonical/grammars/FoodsI.gf
diff --git a/testsuite/canonical/grammars/LexFoods.gf b/src/compiler/testsuite/canonical/grammars/LexFoods.gf
similarity index 100%
rename from testsuite/canonical/grammars/LexFoods.gf
rename to src/compiler/testsuite/canonical/grammars/LexFoods.gf
diff --git a/testsuite/canonical/grammars/LexFoodsFin.gf b/src/compiler/testsuite/canonical/grammars/LexFoodsFin.gf
similarity index 100%
rename from testsuite/canonical/grammars/LexFoodsFin.gf
rename to src/compiler/testsuite/canonical/grammars/LexFoodsFin.gf
diff --git a/testsuite/canonical/grammars/Phrasebook.gf b/src/compiler/testsuite/canonical/grammars/Phrasebook.gf
similarity index 100%
rename from testsuite/canonical/grammars/Phrasebook.gf
rename to src/compiler/testsuite/canonical/grammars/Phrasebook.gf
diff --git a/testsuite/canonical/grammars/PhrasebookBul.gf b/src/compiler/testsuite/canonical/grammars/PhrasebookBul.gf
similarity index 100%
rename from testsuite/canonical/grammars/PhrasebookBul.gf
rename to src/compiler/testsuite/canonical/grammars/PhrasebookBul.gf
diff --git a/testsuite/canonical/grammars/PhrasebookGer.gf b/src/compiler/testsuite/canonical/grammars/PhrasebookGer.gf
similarity index 100%
rename from testsuite/canonical/grammars/PhrasebookGer.gf
rename to src/compiler/testsuite/canonical/grammars/PhrasebookGer.gf
diff --git a/testsuite/canonical/run-on-grammar.sh b/src/compiler/testsuite/canonical/run-on-grammar.sh
similarity index 100%
rename from testsuite/canonical/run-on-grammar.sh
rename to src/compiler/testsuite/canonical/run-on-grammar.sh
diff --git a/testsuite/canonical/run.sh b/src/compiler/testsuite/canonical/run.sh
similarity index 100%
rename from testsuite/canonical/run.sh
rename to src/compiler/testsuite/canonical/run.sh
diff --git a/testsuite/compiler/check/abstract-operations/Nat.gf b/src/compiler/testsuite/compiler/check/abstract-operations/Nat.gf
similarity index 100%
rename from testsuite/compiler/check/abstract-operations/Nat.gf
rename to src/compiler/testsuite/compiler/check/abstract-operations/Nat.gf
diff --git a/testsuite/compiler/check/abstract-operations/abstract-operations.gfs b/src/compiler/testsuite/compiler/check/abstract-operations/abstract-operations.gfs
similarity index 100%
rename from testsuite/compiler/check/abstract-operations/abstract-operations.gfs
rename to src/compiler/testsuite/compiler/check/abstract-operations/abstract-operations.gfs
diff --git a/testsuite/compiler/check/abstract-operations/abstract-operations.gfs.gold b/src/compiler/testsuite/compiler/check/abstract-operations/abstract-operations.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/abstract-operations/abstract-operations.gfs.gold
rename to src/compiler/testsuite/compiler/check/abstract-operations/abstract-operations.gfs.gold
diff --git a/testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf b/src/compiler/testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/Test1Abs.gf
diff --git a/testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf b/src/compiler/testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/Test2Abs.gf
diff --git a/testsuite/compiler/check/cyclic/abs-types/Test3Abs.gf b/src/compiler/testsuite/compiler/check/cyclic/abs-types/Test3Abs.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/Test3Abs.gf
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/Test3Abs.gf
diff --git a/testsuite/compiler/check/cyclic/abs-types/test1.gfs b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test1.gfs
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test1.gfs
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test1.gfs
diff --git a/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test1.gfs.gold
diff --git a/testsuite/compiler/check/cyclic/abs-types/test2.gfs b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test2.gfs
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test2.gfs
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test2.gfs
diff --git a/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test2.gfs.gold
diff --git a/testsuite/compiler/check/cyclic/abs-types/test3.gfs b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test3.gfs
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test3.gfs
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test3.gfs
diff --git a/testsuite/compiler/check/cyclic/abs-types/test3.gfs.gold b/src/compiler/testsuite/compiler/check/cyclic/abs-types/test3.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/cyclic/abs-types/test3.gfs.gold
rename to src/compiler/testsuite/compiler/check/cyclic/abs-types/test3.gfs.gold
diff --git a/testsuite/compiler/check/cyclic/opers/TestOperTypes.gf b/src/compiler/testsuite/compiler/check/cyclic/opers/TestOperTypes.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/opers/TestOperTypes.gf
rename to src/compiler/testsuite/compiler/check/cyclic/opers/TestOperTypes.gf
diff --git a/testsuite/compiler/check/cyclic/opers/TestOpers.gf b/src/compiler/testsuite/compiler/check/cyclic/opers/TestOpers.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/opers/TestOpers.gf
rename to src/compiler/testsuite/compiler/check/cyclic/opers/TestOpers.gf
diff --git a/testsuite/compiler/check/cyclic/opers/test.gfs b/src/compiler/testsuite/compiler/check/cyclic/opers/test.gfs
similarity index 100%
rename from testsuite/compiler/check/cyclic/opers/test.gfs
rename to src/compiler/testsuite/compiler/check/cyclic/opers/test.gfs
diff --git a/testsuite/compiler/check/cyclic/opers/test.gfs.gold b/src/compiler/testsuite/compiler/check/cyclic/opers/test.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/cyclic/opers/test.gfs.gold
rename to src/compiler/testsuite/compiler/check/cyclic/opers/test.gfs.gold
diff --git a/testsuite/compiler/check/cyclic/params/TestParams.gf b/src/compiler/testsuite/compiler/check/cyclic/params/TestParams.gf
similarity index 100%
rename from testsuite/compiler/check/cyclic/params/TestParams.gf
rename to src/compiler/testsuite/compiler/check/cyclic/params/TestParams.gf
diff --git a/testsuite/compiler/check/cyclic/params/test.gfs b/src/compiler/testsuite/compiler/check/cyclic/params/test.gfs
similarity index 100%
rename from testsuite/compiler/check/cyclic/params/test.gfs
rename to src/compiler/testsuite/compiler/check/cyclic/params/test.gfs
diff --git a/testsuite/compiler/check/cyclic/params/test.gfs.gold b/src/compiler/testsuite/compiler/check/cyclic/params/test.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/cyclic/params/test.gfs.gold
rename to src/compiler/testsuite/compiler/check/cyclic/params/test.gfs.gold
diff --git a/testsuite/compiler/check/lincat-types/Predef.gf b/src/compiler/testsuite/compiler/check/lincat-types/Predef.gf
similarity index 100%
rename from testsuite/compiler/check/lincat-types/Predef.gf
rename to src/compiler/testsuite/compiler/check/lincat-types/Predef.gf
diff --git a/testsuite/compiler/check/lincat-types/Test.gf b/src/compiler/testsuite/compiler/check/lincat-types/Test.gf
similarity index 100%
rename from testsuite/compiler/check/lincat-types/Test.gf
rename to src/compiler/testsuite/compiler/check/lincat-types/Test.gf
diff --git a/testsuite/compiler/check/lincat-types/TestCnc.gf b/src/compiler/testsuite/compiler/check/lincat-types/TestCnc.gf
similarity index 100%
rename from testsuite/compiler/check/lincat-types/TestCnc.gf
rename to src/compiler/testsuite/compiler/check/lincat-types/TestCnc.gf
diff --git a/testsuite/compiler/check/lincat-types/test.gfs b/src/compiler/testsuite/compiler/check/lincat-types/test.gfs
similarity index 100%
rename from testsuite/compiler/check/lincat-types/test.gfs
rename to src/compiler/testsuite/compiler/check/lincat-types/test.gfs
diff --git a/testsuite/compiler/check/lincat-types/test.gfs.gold b/src/compiler/testsuite/compiler/check/lincat-types/test.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/lincat-types/test.gfs.gold
rename to src/compiler/testsuite/compiler/check/lincat-types/test.gfs.gold
diff --git a/testsuite/compiler/check/lins/lins.gf b/src/compiler/testsuite/compiler/check/lins/lins.gf
similarity index 100%
rename from testsuite/compiler/check/lins/lins.gf
rename to src/compiler/testsuite/compiler/check/lins/lins.gf
diff --git a/testsuite/compiler/check/lins/lins.gfs b/src/compiler/testsuite/compiler/check/lins/lins.gfs
similarity index 100%
rename from testsuite/compiler/check/lins/lins.gfs
rename to src/compiler/testsuite/compiler/check/lins/lins.gfs
diff --git a/testsuite/compiler/check/lins/lins.gfs.gold b/src/compiler/testsuite/compiler/check/lins/lins.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/lins/lins.gfs.gold
rename to src/compiler/testsuite/compiler/check/lins/lins.gfs.gold
diff --git a/testsuite/compiler/check/lins/linsCnc.gf b/src/compiler/testsuite/compiler/check/lins/linsCnc.gf
similarity index 100%
rename from testsuite/compiler/check/lins/linsCnc.gf
rename to src/compiler/testsuite/compiler/check/lins/linsCnc.gf
diff --git a/testsuite/compiler/check/oper-definition/Res.gf b/src/compiler/testsuite/compiler/check/oper-definition/Res.gf
similarity index 100%
rename from testsuite/compiler/check/oper-definition/Res.gf
rename to src/compiler/testsuite/compiler/check/oper-definition/Res.gf
diff --git a/testsuite/compiler/check/oper-definition/test.gfs b/src/compiler/testsuite/compiler/check/oper-definition/test.gfs
similarity index 100%
rename from testsuite/compiler/check/oper-definition/test.gfs
rename to src/compiler/testsuite/compiler/check/oper-definition/test.gfs
diff --git a/testsuite/compiler/check/oper-definition/test.gfs.gold b/src/compiler/testsuite/compiler/check/oper-definition/test.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/oper-definition/test.gfs.gold
rename to src/compiler/testsuite/compiler/check/oper-definition/test.gfs.gold
diff --git a/testsuite/compiler/check/params/Params.gf b/src/compiler/testsuite/compiler/check/params/Params.gf
similarity index 100%
rename from testsuite/compiler/check/params/Params.gf
rename to src/compiler/testsuite/compiler/check/params/Params.gf
diff --git a/testsuite/compiler/check/restricted-inheritance/A.gf b/src/compiler/testsuite/compiler/check/restricted-inheritance/A.gf
similarity index 100%
rename from testsuite/compiler/check/restricted-inheritance/A.gf
rename to src/compiler/testsuite/compiler/check/restricted-inheritance/A.gf
diff --git a/testsuite/compiler/check/restricted-inheritance/B.gf b/src/compiler/testsuite/compiler/check/restricted-inheritance/B.gf
similarity index 100%
rename from testsuite/compiler/check/restricted-inheritance/B.gf
rename to src/compiler/testsuite/compiler/check/restricted-inheritance/B.gf
diff --git a/testsuite/compiler/check/strMatch/Prelude.gf b/src/compiler/testsuite/compiler/check/strMatch/Prelude.gf
similarity index 100%
rename from testsuite/compiler/check/strMatch/Prelude.gf
rename to src/compiler/testsuite/compiler/check/strMatch/Prelude.gf
diff --git a/testsuite/compiler/check/strMatch/strMatch.gf b/src/compiler/testsuite/compiler/check/strMatch/strMatch.gf
similarity index 100%
rename from testsuite/compiler/check/strMatch/strMatch.gf
rename to src/compiler/testsuite/compiler/check/strMatch/strMatch.gf
diff --git a/testsuite/compiler/check/strMatch/strMatch.gfs b/src/compiler/testsuite/compiler/check/strMatch/strMatch.gfs
similarity index 100%
rename from testsuite/compiler/check/strMatch/strMatch.gfs
rename to src/compiler/testsuite/compiler/check/strMatch/strMatch.gfs
diff --git a/testsuite/compiler/check/strMatch/strMatch.gfs.gold b/src/compiler/testsuite/compiler/check/strMatch/strMatch.gfs.gold
similarity index 100%
rename from testsuite/compiler/check/strMatch/strMatch.gfs.gold
rename to src/compiler/testsuite/compiler/check/strMatch/strMatch.gfs.gold
diff --git a/testsuite/compiler/check/strMatch/strMatchCnc.gf b/src/compiler/testsuite/compiler/check/strMatch/strMatchCnc.gf
similarity index 100%
rename from testsuite/compiler/check/strMatch/strMatchCnc.gf
rename to src/compiler/testsuite/compiler/check/strMatch/strMatchCnc.gf
diff --git a/testsuite/compiler/compute/lambda.gfs b/src/compiler/testsuite/compiler/compute/lambda.gfs
similarity index 100%
rename from testsuite/compiler/compute/lambda.gfs
rename to src/compiler/testsuite/compiler/compute/lambda.gfs
diff --git a/testsuite/compiler/compute/lambda.gfs.gold b/src/compiler/testsuite/compiler/compute/lambda.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/lambda.gfs.gold
rename to src/compiler/testsuite/compiler/compute/lambda.gfs.gold
diff --git a/testsuite/compiler/compute/param_table.gf b/src/compiler/testsuite/compiler/compute/param_table.gf
similarity index 100%
rename from testsuite/compiler/compute/param_table.gf
rename to src/compiler/testsuite/compiler/compute/param_table.gf
diff --git a/testsuite/compiler/compute/param_table.gfs b/src/compiler/testsuite/compiler/compute/param_table.gfs
similarity index 100%
rename from testsuite/compiler/compute/param_table.gfs
rename to src/compiler/testsuite/compiler/compute/param_table.gfs
diff --git a/testsuite/compiler/compute/param_table.gfs.gold b/src/compiler/testsuite/compiler/compute/param_table.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/param_table.gfs.gold
rename to src/compiler/testsuite/compiler/compute/param_table.gfs.gold
diff --git a/testsuite/compiler/compute/predef.gfs b/src/compiler/testsuite/compiler/compute/predef.gfs
similarity index 100%
rename from testsuite/compiler/compute/predef.gfs
rename to src/compiler/testsuite/compiler/compute/predef.gfs
diff --git a/testsuite/compiler/compute/predef.gfs.gold b/src/compiler/testsuite/compiler/compute/predef.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/predef.gfs.gold
rename to src/compiler/testsuite/compiler/compute/predef.gfs.gold
diff --git a/testsuite/compiler/compute/record.gf b/src/compiler/testsuite/compiler/compute/record.gf
similarity index 100%
rename from testsuite/compiler/compute/record.gf
rename to src/compiler/testsuite/compiler/compute/record.gf
diff --git a/testsuite/compiler/compute/record.gfs b/src/compiler/testsuite/compiler/compute/record.gfs
similarity index 100%
rename from testsuite/compiler/compute/record.gfs
rename to src/compiler/testsuite/compiler/compute/record.gfs
diff --git a/testsuite/compiler/compute/record.gfs.gold b/src/compiler/testsuite/compiler/compute/record.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/record.gfs.gold
rename to src/compiler/testsuite/compiler/compute/record.gfs.gold
diff --git a/testsuite/compiler/compute/string_matching.gfs b/src/compiler/testsuite/compiler/compute/string_matching.gfs
similarity index 100%
rename from testsuite/compiler/compute/string_matching.gfs
rename to src/compiler/testsuite/compiler/compute/string_matching.gfs
diff --git a/testsuite/compiler/compute/string_matching.gfs.gold b/src/compiler/testsuite/compiler/compute/string_matching.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/string_matching.gfs.gold
rename to src/compiler/testsuite/compiler/compute/string_matching.gfs.gold
diff --git a/testsuite/compiler/compute/variant.gf b/src/compiler/testsuite/compiler/compute/variant.gf
similarity index 100%
rename from testsuite/compiler/compute/variant.gf
rename to src/compiler/testsuite/compiler/compute/variant.gf
diff --git a/testsuite/compiler/compute/variant.gfs b/src/compiler/testsuite/compiler/compute/variant.gfs
similarity index 100%
rename from testsuite/compiler/compute/variant.gfs
rename to src/compiler/testsuite/compiler/compute/variant.gfs
diff --git a/testsuite/compiler/compute/variant.gfs.gold b/src/compiler/testsuite/compiler/compute/variant.gfs.gold
similarity index 100%
rename from testsuite/compiler/compute/variant.gfs.gold
rename to src/compiler/testsuite/compiler/compute/variant.gfs.gold
diff --git a/testsuite/compiler/params/params.gf b/src/compiler/testsuite/compiler/params/params.gf
similarity index 100%
rename from testsuite/compiler/params/params.gf
rename to src/compiler/testsuite/compiler/params/params.gf
diff --git a/testsuite/compiler/params/params.gfs b/src/compiler/testsuite/compiler/params/params.gfs
similarity index 100%
rename from testsuite/compiler/params/params.gfs
rename to src/compiler/testsuite/compiler/params/params.gfs
diff --git a/testsuite/compiler/params/params.gfs.gold b/src/compiler/testsuite/compiler/params/params.gfs.gold
similarity index 100%
rename from testsuite/compiler/params/params.gfs.gold
rename to src/compiler/testsuite/compiler/params/params.gfs.gold
diff --git a/testsuite/compiler/params/paramsCnc.gf b/src/compiler/testsuite/compiler/params/paramsCnc.gf
similarity index 100%
rename from testsuite/compiler/params/paramsCnc.gf
rename to src/compiler/testsuite/compiler/params/paramsCnc.gf
diff --git a/testsuite/compiler/renamer/funpatt.gf b/src/compiler/testsuite/compiler/renamer/funpatt.gf
similarity index 100%
rename from testsuite/compiler/renamer/funpatt.gf
rename to src/compiler/testsuite/compiler/renamer/funpatt.gf
diff --git a/testsuite/compiler/renamer/funpatt.gfs b/src/compiler/testsuite/compiler/renamer/funpatt.gfs
similarity index 100%
rename from testsuite/compiler/renamer/funpatt.gfs
rename to src/compiler/testsuite/compiler/renamer/funpatt.gfs
diff --git a/testsuite/compiler/renamer/funpatt.gfs.gold b/src/compiler/testsuite/compiler/renamer/funpatt.gfs.gold
similarity index 100%
rename from testsuite/compiler/renamer/funpatt.gfs.gold
rename to src/compiler/testsuite/compiler/renamer/funpatt.gfs.gold
diff --git a/testsuite/compiler/renamer/varpatt.gf b/src/compiler/testsuite/compiler/renamer/varpatt.gf
similarity index 100%
rename from testsuite/compiler/renamer/varpatt.gf
rename to src/compiler/testsuite/compiler/renamer/varpatt.gf
diff --git a/testsuite/compiler/renamer/varpatt.gfs b/src/compiler/testsuite/compiler/renamer/varpatt.gfs
similarity index 100%
rename from testsuite/compiler/renamer/varpatt.gfs
rename to src/compiler/testsuite/compiler/renamer/varpatt.gfs
diff --git a/testsuite/compiler/renamer/varpatt.gfs.gold b/src/compiler/testsuite/compiler/renamer/varpatt.gfs.gold
similarity index 100%
rename from testsuite/compiler/renamer/varpatt.gfs.gold
rename to src/compiler/testsuite/compiler/renamer/varpatt.gfs.gold
diff --git a/testsuite/compiler/typecheck/Check.gf b/src/compiler/testsuite/compiler/typecheck/Check.gf
similarity index 100%
rename from testsuite/compiler/typecheck/Check.gf
rename to src/compiler/testsuite/compiler/typecheck/Check.gf
diff --git a/testsuite/compiler/typecheck/abstract/A.gf b/src/compiler/testsuite/compiler/typecheck/abstract/A.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/A.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/A.gf
diff --git a/testsuite/compiler/typecheck/abstract/B.gf b/src/compiler/testsuite/compiler/typecheck/abstract/B.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/B.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/B.gf
diff --git a/testsuite/compiler/typecheck/abstract/C.gf b/src/compiler/testsuite/compiler/typecheck/abstract/C.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/C.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/C.gf
diff --git a/testsuite/compiler/typecheck/abstract/LetInDefAbs.gf b/src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInDefAbs.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gf
diff --git a/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs
diff --git a/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInDefAbs.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gf b/src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInTypesAbs.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gf
diff --git a/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs
diff --git a/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/LetInTypesAbs.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/LitAbs.gf b/src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LitAbs.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gf
diff --git a/testsuite/compiler/typecheck/abstract/LitAbs.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LitAbs.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gfs
diff --git a/testsuite/compiler/typecheck/abstract/LitAbs.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/LitAbs.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/LitAbs.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/PolyTypes.gf b/src/compiler/testsuite/compiler/typecheck/abstract/PolyTypes.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/PolyTypes.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/PolyTypes.gf
diff --git a/testsuite/compiler/typecheck/abstract/RecTypes.gf b/src/compiler/testsuite/compiler/typecheck/abstract/RecTypes.gf
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/RecTypes.gf
rename to src/compiler/testsuite/compiler/typecheck/abstract/RecTypes.gf
diff --git a/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs
diff --git a/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/non-abstract-terms.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/test_A.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/test_A.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_A.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_A.gfs
diff --git a/testsuite/compiler/typecheck/abstract/test_A.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/test_A.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_A.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_A.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/test_B.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/test_B.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_B.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_B.gfs
diff --git a/testsuite/compiler/typecheck/abstract/test_B.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/test_B.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_B.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_B.gfs.gold
diff --git a/testsuite/compiler/typecheck/abstract/test_C.gfs b/src/compiler/testsuite/compiler/typecheck/abstract/test_C.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_C.gfs
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_C.gfs
diff --git a/testsuite/compiler/typecheck/abstract/test_C.gfs.gold b/src/compiler/testsuite/compiler/typecheck/abstract/test_C.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/abstract/test_C.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/abstract/test_C.gfs.gold
diff --git a/testsuite/compiler/typecheck/concrete/A.gf b/src/compiler/testsuite/compiler/typecheck/concrete/A.gf
similarity index 100%
rename from testsuite/compiler/typecheck/concrete/A.gf
rename to src/compiler/testsuite/compiler/typecheck/concrete/A.gf
diff --git a/testsuite/compiler/typecheck/concrete/test_A.gfs b/src/compiler/testsuite/compiler/typecheck/concrete/test_A.gfs
similarity index 100%
rename from testsuite/compiler/typecheck/concrete/test_A.gfs
rename to src/compiler/testsuite/compiler/typecheck/concrete/test_A.gfs
diff --git a/testsuite/compiler/typecheck/concrete/test_A.gfs.gold b/src/compiler/testsuite/compiler/typecheck/concrete/test_A.gfs.gold
similarity index 100%
rename from testsuite/compiler/typecheck/concrete/test_A.gfs.gold
rename to src/compiler/testsuite/compiler/typecheck/concrete/test_A.gfs.gold
diff --git a/testsuite/compiler/update/ArrityCheck.gf b/src/compiler/testsuite/compiler/update/ArrityCheck.gf
similarity index 100%
rename from testsuite/compiler/update/ArrityCheck.gf
rename to src/compiler/testsuite/compiler/update/ArrityCheck.gf
diff --git a/testsuite/compiler/update/ArrityCheck.gfs b/src/compiler/testsuite/compiler/update/ArrityCheck.gfs
similarity index 100%
rename from testsuite/compiler/update/ArrityCheck.gfs
rename to src/compiler/testsuite/compiler/update/ArrityCheck.gfs
diff --git a/testsuite/compiler/update/ArrityCheck.gfs.gold b/src/compiler/testsuite/compiler/update/ArrityCheck.gfs.gold
similarity index 100%
rename from testsuite/compiler/update/ArrityCheck.gfs.gold
rename to src/compiler/testsuite/compiler/update/ArrityCheck.gfs.gold
diff --git a/testsuite/run.hs b/src/compiler/testsuite/run.hs
similarity index 100%
rename from testsuite/run.hs
rename to src/compiler/testsuite/run.hs
diff --git a/testsuite/runtime/eval/Test.gf b/src/compiler/testsuite/runtime/eval/Test.gf
similarity index 100%
rename from testsuite/runtime/eval/Test.gf
rename to src/compiler/testsuite/runtime/eval/Test.gf
diff --git a/testsuite/runtime/eval/eval.gfs b/src/compiler/testsuite/runtime/eval/eval.gfs
similarity index 100%
rename from testsuite/runtime/eval/eval.gfs
rename to src/compiler/testsuite/runtime/eval/eval.gfs
diff --git a/testsuite/runtime/eval/eval.gfs.gold b/src/compiler/testsuite/runtime/eval/eval.gfs.gold
similarity index 100%
rename from testsuite/runtime/eval/eval.gfs.gold
rename to src/compiler/testsuite/runtime/eval/eval.gfs.gold
diff --git a/testsuite/runtime/eval/lazy.gf b/src/compiler/testsuite/runtime/eval/lazy.gf
similarity index 100%
rename from testsuite/runtime/eval/lazy.gf
rename to src/compiler/testsuite/runtime/eval/lazy.gf
diff --git a/testsuite/runtime/eval/lazy.gfs b/src/compiler/testsuite/runtime/eval/lazy.gfs
similarity index 100%
rename from testsuite/runtime/eval/lazy.gfs
rename to src/compiler/testsuite/runtime/eval/lazy.gfs
diff --git a/testsuite/runtime/eval/lazy.gfs.gold b/src/compiler/testsuite/runtime/eval/lazy.gfs.gold
similarity index 100%
rename from testsuite/runtime/eval/lazy.gfs.gold
rename to src/compiler/testsuite/runtime/eval/lazy.gfs.gold
diff --git a/testsuite/runtime/linearize/Test.gf b/src/compiler/testsuite/runtime/linearize/Test.gf
similarity index 100%
rename from testsuite/runtime/linearize/Test.gf
rename to src/compiler/testsuite/runtime/linearize/Test.gf
diff --git a/testsuite/runtime/linearize/TestCnc.gf b/src/compiler/testsuite/runtime/linearize/TestCnc.gf
similarity index 100%
rename from testsuite/runtime/linearize/TestCnc.gf
rename to src/compiler/testsuite/runtime/linearize/TestCnc.gf
diff --git a/testsuite/runtime/linearize/brackets.gfs b/src/compiler/testsuite/runtime/linearize/brackets.gfs
similarity index 100%
rename from testsuite/runtime/linearize/brackets.gfs
rename to src/compiler/testsuite/runtime/linearize/brackets.gfs
diff --git a/testsuite/runtime/linearize/brackets.gfs.gold b/src/compiler/testsuite/runtime/linearize/brackets.gfs.gold
similarity index 100%
rename from testsuite/runtime/linearize/brackets.gfs.gold
rename to src/compiler/testsuite/runtime/linearize/brackets.gfs.gold
diff --git a/testsuite/runtime/linearize/linearize.gfs b/src/compiler/testsuite/runtime/linearize/linearize.gfs
similarity index 100%
rename from testsuite/runtime/linearize/linearize.gfs
rename to src/compiler/testsuite/runtime/linearize/linearize.gfs
diff --git a/testsuite/runtime/linearize/linearize.gfs.gold b/src/compiler/testsuite/runtime/linearize/linearize.gfs.gold
similarity index 100%
rename from testsuite/runtime/linearize/linearize.gfs.gold
rename to src/compiler/testsuite/runtime/linearize/linearize.gfs.gold
diff --git a/testsuite/runtime/paraphrase/City.gf b/src/compiler/testsuite/runtime/paraphrase/City.gf
similarity index 100%
rename from testsuite/runtime/paraphrase/City.gf
rename to src/compiler/testsuite/runtime/paraphrase/City.gf
diff --git a/testsuite/runtime/paraphrase/CityEng.gf b/src/compiler/testsuite/runtime/paraphrase/CityEng.gf
similarity index 100%
rename from testsuite/runtime/paraphrase/CityEng.gf
rename to src/compiler/testsuite/runtime/paraphrase/CityEng.gf
diff --git a/testsuite/runtime/paraphrase/Nat.gf b/src/compiler/testsuite/runtime/paraphrase/Nat.gf
similarity index 100%
rename from testsuite/runtime/paraphrase/Nat.gf
rename to src/compiler/testsuite/runtime/paraphrase/Nat.gf
diff --git a/testsuite/runtime/paraphrase/lambda.gf b/src/compiler/testsuite/runtime/paraphrase/lambda.gf
similarity index 100%
rename from testsuite/runtime/paraphrase/lambda.gf
rename to src/compiler/testsuite/runtime/paraphrase/lambda.gf
diff --git a/testsuite/runtime/paraphrase/lambda.gfs b/src/compiler/testsuite/runtime/paraphrase/lambda.gfs
similarity index 100%
rename from testsuite/runtime/paraphrase/lambda.gfs
rename to src/compiler/testsuite/runtime/paraphrase/lambda.gfs
diff --git a/testsuite/runtime/paraphrase/lambda.gfs.gold b/src/compiler/testsuite/runtime/paraphrase/lambda.gfs.gold
similarity index 100%
rename from testsuite/runtime/paraphrase/lambda.gfs.gold
rename to src/compiler/testsuite/runtime/paraphrase/lambda.gfs.gold
diff --git a/testsuite/runtime/paraphrase/test.gfs.gold b/src/compiler/testsuite/runtime/paraphrase/test.gfs.gold
similarity index 100%
rename from testsuite/runtime/paraphrase/test.gfs.gold
rename to src/compiler/testsuite/runtime/paraphrase/test.gfs.gold
diff --git a/testsuite/runtime/parser/DummyNat.gf b/src/compiler/testsuite/runtime/parser/DummyNat.gf
similarity index 100%
rename from testsuite/runtime/parser/DummyNat.gf
rename to src/compiler/testsuite/runtime/parser/DummyNat.gf
diff --git a/testsuite/runtime/parser/DummyNatCnc.gf b/src/compiler/testsuite/runtime/parser/DummyNatCnc.gf
similarity index 100%
rename from testsuite/runtime/parser/DummyNatCnc.gf
rename to src/compiler/testsuite/runtime/parser/DummyNatCnc.gf
diff --git a/testsuite/runtime/parser/Literals.gf b/src/compiler/testsuite/runtime/parser/Literals.gf
similarity index 100%
rename from testsuite/runtime/parser/Literals.gf
rename to src/compiler/testsuite/runtime/parser/Literals.gf
diff --git a/testsuite/runtime/parser/LiteralsCnc.gf b/src/compiler/testsuite/runtime/parser/LiteralsCnc.gf
similarity index 100%
rename from testsuite/runtime/parser/LiteralsCnc.gf
rename to src/compiler/testsuite/runtime/parser/LiteralsCnc.gf
diff --git a/testsuite/runtime/parser/Parse.hs b/src/compiler/testsuite/runtime/parser/Parse.hs
similarity index 100%
rename from testsuite/runtime/parser/Parse.hs
rename to src/compiler/testsuite/runtime/parser/Parse.hs
diff --git a/testsuite/runtime/parser/parser.gfs b/src/compiler/testsuite/runtime/parser/parser.gfs
similarity index 100%
rename from testsuite/runtime/parser/parser.gfs
rename to src/compiler/testsuite/runtime/parser/parser.gfs
diff --git a/testsuite/runtime/parser/parser.gfs.gold b/src/compiler/testsuite/runtime/parser/parser.gfs.gold
similarity index 100%
rename from testsuite/runtime/parser/parser.gfs.gold
rename to src/compiler/testsuite/runtime/parser/parser.gfs.gold
diff --git a/testsuite/runtime/typecheck/Graph.gf b/src/compiler/testsuite/runtime/typecheck/Graph.gf
similarity index 100%
rename from testsuite/runtime/typecheck/Graph.gf
rename to src/compiler/testsuite/runtime/typecheck/Graph.gf
diff --git a/testsuite/runtime/typecheck/Hard.gf b/src/compiler/testsuite/runtime/typecheck/Hard.gf
similarity index 100%
rename from testsuite/runtime/typecheck/Hard.gf
rename to src/compiler/testsuite/runtime/typecheck/Hard.gf
diff --git a/testsuite/runtime/typecheck/Test.gf b/src/compiler/testsuite/runtime/typecheck/Test.gf
similarity index 100%
rename from testsuite/runtime/typecheck/Test.gf
rename to src/compiler/testsuite/runtime/typecheck/Test.gf
diff --git a/testsuite/runtime/typecheck/hard-unification.gfs b/src/compiler/testsuite/runtime/typecheck/hard-unification.gfs
similarity index 100%
rename from testsuite/runtime/typecheck/hard-unification.gfs
rename to src/compiler/testsuite/runtime/typecheck/hard-unification.gfs
diff --git a/testsuite/runtime/typecheck/hard-unification.gfs.gold b/src/compiler/testsuite/runtime/typecheck/hard-unification.gfs.gold
similarity index 100%
rename from testsuite/runtime/typecheck/hard-unification.gfs.gold
rename to src/compiler/testsuite/runtime/typecheck/hard-unification.gfs.gold
diff --git a/testsuite/runtime/typecheck/implicit-arguments.gfs b/src/compiler/testsuite/runtime/typecheck/implicit-arguments.gfs
similarity index 100%
rename from testsuite/runtime/typecheck/implicit-arguments.gfs
rename to src/compiler/testsuite/runtime/typecheck/implicit-arguments.gfs
diff --git a/testsuite/runtime/typecheck/implicit-arguments.gfs.gold b/src/compiler/testsuite/runtime/typecheck/implicit-arguments.gfs.gold
similarity index 100%
rename from testsuite/runtime/typecheck/implicit-arguments.gfs.gold
rename to src/compiler/testsuite/runtime/typecheck/implicit-arguments.gfs.gold
diff --git a/testsuite/runtime/typecheck/typecheck.gfs b/src/compiler/testsuite/runtime/typecheck/typecheck.gfs
similarity index 100%
rename from testsuite/runtime/typecheck/typecheck.gfs
rename to src/compiler/testsuite/runtime/typecheck/typecheck.gfs
diff --git a/testsuite/runtime/typecheck/typecheck.gfs.gold b/src/compiler/testsuite/runtime/typecheck/typecheck.gfs.gold
similarity index 100%
rename from testsuite/runtime/typecheck/typecheck.gfs.gold
rename to src/compiler/testsuite/runtime/typecheck/typecheck.gfs.gold
diff --git a/src/www/P/cloud.png b/src/compiler/www/P/cloud.png
similarity index 100%
rename from src/www/P/cloud.png
rename to src/compiler/www/P/cloud.png
diff --git a/src/www/P/gf-cloud.png b/src/compiler/www/P/gf-cloud.png
similarity index 100%
rename from src/www/P/gf-cloud.png
rename to src/compiler/www/P/gf-cloud.png
diff --git a/src/www/TransQuiz/brushed-metal.png b/src/compiler/www/TransQuiz/brushed-metal.png
similarity index 100%
rename from src/www/TransQuiz/brushed-metal.png
rename to src/compiler/www/TransQuiz/brushed-metal.png
diff --git a/src/www/TransQuiz/minibar_quiz.css b/src/compiler/www/TransQuiz/minibar_quiz.css
similarity index 100%
rename from src/www/TransQuiz/minibar_quiz.css
rename to src/compiler/www/TransQuiz/minibar_quiz.css
diff --git a/src/www/TransQuiz/minibar_quiz.js b/src/compiler/www/TransQuiz/minibar_quiz.js
similarity index 100%
rename from src/www/TransQuiz/minibar_quiz.js
rename to src/compiler/www/TransQuiz/minibar_quiz.js
diff --git a/src/www/TransQuiz/pgf_online.js b/src/compiler/www/TransQuiz/pgf_online.js
similarity index 100%
rename from src/www/TransQuiz/pgf_online.js
rename to src/compiler/www/TransQuiz/pgf_online.js
diff --git a/src/www/TransQuiz/quiz_about.html b/src/compiler/www/TransQuiz/quiz_about.html
similarity index 100%
rename from src/www/TransQuiz/quiz_about.html
rename to src/compiler/www/TransQuiz/quiz_about.html
diff --git a/src/www/TransQuiz/quiz_help.html b/src/compiler/www/TransQuiz/quiz_help.html
similarity index 100%
rename from src/www/TransQuiz/quiz_help.html
rename to src/compiler/www/TransQuiz/quiz_help.html
diff --git a/src/www/TransQuiz/quiz_pre_start.js b/src/compiler/www/TransQuiz/quiz_pre_start.js
similarity index 100%
rename from src/www/TransQuiz/quiz_pre_start.js
rename to src/compiler/www/TransQuiz/quiz_pre_start.js
diff --git a/src/www/TransQuiz/quiz_support.js b/src/compiler/www/TransQuiz/quiz_support.js
similarity index 100%
rename from src/www/TransQuiz/quiz_support.js
rename to src/compiler/www/TransQuiz/quiz_support.js
diff --git a/src/www/TransQuiz/support.js b/src/compiler/www/TransQuiz/support.js
similarity index 100%
rename from src/www/TransQuiz/support.js
rename to src/compiler/www/TransQuiz/support.js
diff --git a/src/www/TransQuiz/translation_quiz.html b/src/compiler/www/TransQuiz/translation_quiz.html
similarity index 100%
rename from src/www/TransQuiz/translation_quiz.html
rename to src/compiler/www/TransQuiz/translation_quiz.html
diff --git a/src/www/TransQuiz/translation_quiz.js b/src/compiler/www/TransQuiz/translation_quiz.js
similarity index 100%
rename from src/www/TransQuiz/translation_quiz.js
rename to src/compiler/www/TransQuiz/translation_quiz.js
diff --git a/src/www/cloud.css b/src/compiler/www/cloud.css
similarity index 100%
rename from src/www/cloud.css
rename to src/compiler/www/cloud.css
diff --git a/src/www/gf-cloud-api.html b/src/compiler/www/gf-cloud-api.html
similarity index 100%
rename from src/www/gf-cloud-api.html
rename to src/compiler/www/gf-cloud-api.html
diff --git a/src/www/gf-web-api-examples.html b/src/compiler/www/gf-web-api-examples.html
similarity index 100%
rename from src/www/gf-web-api-examples.html
rename to src/compiler/www/gf-web-api-examples.html
diff --git a/src/www/gf-web-api.t2t b/src/compiler/www/gf-web-api.t2t
similarity index 100%
rename from src/www/gf-web-api.t2t
rename to src/compiler/www/gf-web-api.t2t
diff --git a/src/www/gfmorpho/GFMorpho.hs b/src/compiler/www/gfmorpho/GFMorpho.hs
similarity index 100%
rename from src/www/gfmorpho/GFMorpho.hs
rename to src/compiler/www/gfmorpho/GFMorpho.hs
diff --git a/src/www/gfmorpho/README b/src/compiler/www/gfmorpho/README
similarity index 100%
rename from src/www/gfmorpho/README
rename to src/compiler/www/gfmorpho/README
diff --git a/src/www/gfmorpho/gfmorpho.cgi b/src/compiler/www/gfmorpho/gfmorpho.cgi
similarity index 100%
rename from src/www/gfmorpho/gfmorpho.cgi
rename to src/compiler/www/gfmorpho/gfmorpho.cgi
diff --git a/src/www/gfmorpho/gfmorpho.html b/src/compiler/www/gfmorpho/gfmorpho.html
similarity index 100%
rename from src/www/gfmorpho/gfmorpho.html
rename to src/compiler/www/gfmorpho/gfmorpho.html
diff --git a/src/www/gfmorpho/index.html b/src/compiler/www/gfmorpho/index.html
similarity index 100%
rename from src/www/gfmorpho/index.html
rename to src/compiler/www/gfmorpho/index.html
diff --git a/src/www/gfmorpho/morpho.js b/src/compiler/www/gfmorpho/morpho.js
similarity index 100%
rename from src/www/gfmorpho/morpho.js
rename to src/compiler/www/gfmorpho/morpho.js
diff --git a/src/www/gfse/Makefile b/src/compiler/www/gfse/Makefile
similarity index 100%
rename from src/www/gfse/Makefile
rename to src/compiler/www/gfse/Makefile
diff --git a/src/www/gfse/P/1306856253_weather_06.png b/src/compiler/www/gfse/P/1306856253_weather_06.png
similarity index 100%
rename from src/www/gfse/P/1306856253_weather_06.png
rename to src/compiler/www/gfse/P/1306856253_weather_06.png
diff --git a/src/www/gfse/P/1307545089_weather_04.png b/src/compiler/www/gfse/P/1307545089_weather_04.png
similarity index 100%
rename from src/www/gfse/P/1307545089_weather_04.png
rename to src/compiler/www/gfse/P/1307545089_weather_04.png
diff --git a/src/www/gfse/P/1343909216_weather_03.png b/src/compiler/www/gfse/P/1343909216_weather_03.png
similarity index 100%
rename from src/www/gfse/P/1343909216_weather_03.png
rename to src/compiler/www/gfse/P/1343909216_weather_03.png
diff --git a/src/www/gfse/P/w1s.jpg b/src/compiler/www/gfse/P/w1s.jpg
similarity index 100%
rename from src/www/gfse/P/w1s.jpg
rename to src/compiler/www/gfse/P/w1s.jpg
diff --git a/src/www/gfse/P/w2s.jpg b/src/compiler/www/gfse/P/w2s.jpg
similarity index 100%
rename from src/www/gfse/P/w2s.jpg
rename to src/compiler/www/gfse/P/w2s.jpg
diff --git a/src/www/gfse/P/w3s.jpg b/src/compiler/www/gfse/P/w3s.jpg
similarity index 100%
rename from src/www/gfse/P/w3s.jpg
rename to src/compiler/www/gfse/P/w3s.jpg
diff --git a/src/www/gfse/P/w4s.jpg b/src/compiler/www/gfse/P/w4s.jpg
similarity index 100%
rename from src/www/gfse/P/w4s.jpg
rename to src/compiler/www/gfse/P/w4s.jpg
diff --git a/src/www/gfse/TODO b/src/compiler/www/gfse/TODO
similarity index 100%
rename from src/www/gfse/TODO
rename to src/compiler/www/gfse/TODO
diff --git a/src/www/gfse/about.html b/src/compiler/www/gfse/about.html
similarity index 100%
rename from src/www/gfse/about.html
rename to src/compiler/www/gfse/about.html
diff --git a/src/www/gfse/cloud.js b/src/compiler/www/gfse/cloud.js
similarity index 100%
rename from src/www/gfse/cloud.js
rename to src/compiler/www/gfse/cloud.js
diff --git a/src/www/gfse/cloud2.js b/src/compiler/www/gfse/cloud2.js
similarity index 100%
rename from src/www/gfse/cloud2.js
rename to src/compiler/www/gfse/cloud2.js
diff --git a/src/www/gfse/editor.css b/src/compiler/www/gfse/editor.css
similarity index 100%
rename from src/www/gfse/editor.css
rename to src/compiler/www/gfse/editor.css
diff --git a/src/www/gfse/editor.js b/src/compiler/www/gfse/editor.js
similarity index 100%
rename from src/www/gfse/editor.js
rename to src/compiler/www/gfse/editor.js
diff --git a/src/www/gfse/example_based.js b/src/compiler/www/gfse/example_based.js
similarity index 100%
rename from src/www/gfse/example_based.js
rename to src/compiler/www/gfse/example_based.js
diff --git a/src/www/gfse/gf_abs.js b/src/compiler/www/gfse/gf_abs.js
similarity index 100%
rename from src/www/gfse/gf_abs.js
rename to src/compiler/www/gfse/gf_abs.js
diff --git a/src/www/gfse/gfse.manifest b/src/compiler/www/gfse/gfse.manifest
similarity index 100%
rename from src/www/gfse/gfse.manifest
rename to src/compiler/www/gfse/gfse.manifest
diff --git a/src/www/gfse/index.html b/src/compiler/www/gfse/index.html
similarity index 100%
rename from src/www/gfse/index.html
rename to src/compiler/www/gfse/index.html
diff --git a/src/www/gfse/localstorage.js b/src/compiler/www/gfse/localstorage.js
similarity index 100%
rename from src/www/gfse/localstorage.js
rename to src/compiler/www/gfse/localstorage.js
diff --git a/src/www/gfse/molto.css b/src/compiler/www/gfse/molto.css
similarity index 100%
rename from src/www/gfse/molto.css
rename to src/compiler/www/gfse/molto.css
diff --git a/src/www/gfse/share.html b/src/compiler/www/gfse/share.html
similarity index 100%
rename from src/www/gfse/share.html
rename to src/compiler/www/gfse/share.html
diff --git a/src/www/gfse/slideshow.js b/src/compiler/www/gfse/slideshow.js
similarity index 100%
rename from src/www/gfse/slideshow.js
rename to src/compiler/www/gfse/slideshow.js
diff --git a/src/www/gfse/sort.js b/src/compiler/www/gfse/sort.js
similarity index 100%
rename from src/www/gfse/sort.js
rename to src/compiler/www/gfse/sort.js
diff --git a/src/www/index.html b/src/compiler/www/index.html
similarity index 100%
rename from src/www/index.html
rename to src/compiler/www/index.html
diff --git a/src/www/js/d3Tree.js b/src/compiler/www/js/d3Tree.js
similarity index 100%
rename from src/www/js/d3Tree.js
rename to src/compiler/www/js/d3Tree.js
diff --git a/src/www/js/gfrobust.js b/src/compiler/www/js/gfrobust.js
similarity index 100%
rename from src/www/js/gfrobust.js
rename to src/compiler/www/js/gfrobust.js
diff --git a/src/www/js/gftranslate.js b/src/compiler/www/js/gftranslate.js
similarity index 100%
rename from src/www/js/gftranslate.js
rename to src/compiler/www/js/gftranslate.js
diff --git a/src/www/js/grammar_manager.js b/src/compiler/www/js/grammar_manager.js
similarity index 100%
rename from src/www/js/grammar_manager.js
rename to src/compiler/www/js/grammar_manager.js
diff --git a/src/www/js/langcode.js b/src/compiler/www/js/langcode.js
similarity index 100%
rename from src/www/js/langcode.js
rename to src/compiler/www/js/langcode.js
diff --git a/src/www/js/localstorage.js b/src/compiler/www/js/localstorage.js
similarity index 100%
rename from src/www/js/localstorage.js
rename to src/compiler/www/js/localstorage.js
diff --git a/src/www/js/pgf_online.js b/src/compiler/www/js/pgf_online.js
similarity index 100%
rename from src/www/js/pgf_online.js
rename to src/compiler/www/js/pgf_online.js
diff --git a/src/www/js/support.js b/src/compiler/www/js/support.js
similarity index 100%
rename from src/www/js/support.js
rename to src/compiler/www/js/support.js
diff --git a/src/www/js/wc.js b/src/compiler/www/js/wc.js
similarity index 100%
rename from src/www/js/wc.js
rename to src/compiler/www/js/wc.js
diff --git a/src/www/minibar/about.html b/src/compiler/www/minibar/about.html
similarity index 100%
rename from src/www/minibar/about.html
rename to src/compiler/www/minibar/about.html
diff --git a/src/www/minibar/align-btn.png b/src/compiler/www/minibar/align-btn.png
similarity index 100%
rename from src/www/minibar/align-btn.png
rename to src/compiler/www/minibar/align-btn.png
diff --git a/src/www/minibar/brushed-metal.png b/src/compiler/www/minibar/brushed-metal.png
similarity index 100%
rename from src/www/minibar/brushed-metal.png
rename to src/compiler/www/minibar/brushed-metal.png
diff --git a/src/www/minibar/example.html b/src/compiler/www/minibar/example.html
similarity index 100%
rename from src/www/minibar/example.html
rename to src/compiler/www/minibar/example.html
diff --git a/src/www/minibar/feedback.cgi b/src/compiler/www/minibar/feedback.cgi
similarity index 100%
rename from src/www/minibar/feedback.cgi
rename to src/compiler/www/minibar/feedback.cgi
diff --git a/src/www/minibar/feedback.html b/src/compiler/www/minibar/feedback.html
similarity index 100%
rename from src/www/minibar/feedback.html
rename to src/compiler/www/minibar/feedback.html
diff --git a/src/www/minibar/minibar-api.html b/src/compiler/www/minibar/minibar-api.html
similarity index 100%
rename from src/www/minibar/minibar-api.html
rename to src/compiler/www/minibar/minibar-api.html
diff --git a/src/www/minibar/minibar.css b/src/compiler/www/minibar/minibar.css
similarity index 100%
rename from src/www/minibar/minibar.css
rename to src/compiler/www/minibar/minibar.css
diff --git a/src/www/minibar/minibar.html b/src/compiler/www/minibar/minibar.html
similarity index 100%
rename from src/www/minibar/minibar.html
rename to src/compiler/www/minibar/minibar.html
diff --git a/src/www/minibar/minibar.js b/src/compiler/www/minibar/minibar.js
similarity index 100%
rename from src/www/minibar/minibar.js
rename to src/compiler/www/minibar/minibar.js
diff --git a/src/www/minibar/minibar_input.js b/src/compiler/www/minibar/minibar_input.js
similarity index 100%
rename from src/www/minibar/minibar_input.js
rename to src/compiler/www/minibar/minibar_input.js
diff --git a/src/www/minibar/minibar_offline.html b/src/compiler/www/minibar/minibar_offline.html
similarity index 100%
rename from src/www/minibar/minibar_offline.html
rename to src/compiler/www/minibar/minibar_offline.html
diff --git a/src/www/minibar/minibar_offline.js b/src/compiler/www/minibar/minibar_offline.js
similarity index 100%
rename from src/www/minibar/minibar_offline.js
rename to src/compiler/www/minibar/minibar_offline.js
diff --git a/src/www/minibar/minibar_offline.manifest b/src/compiler/www/minibar/minibar_offline.manifest
similarity index 100%
rename from src/www/minibar/minibar_offline.manifest
rename to src/compiler/www/minibar/minibar_offline.manifest
diff --git a/src/www/minibar/minibar_online.js b/src/compiler/www/minibar/minibar_online.js
similarity index 100%
rename from src/www/minibar/minibar_online.js
rename to src/compiler/www/minibar/minibar_online.js
diff --git a/src/www/minibar/minibar_support.js b/src/compiler/www/minibar/minibar_support.js
similarity index 100%
rename from src/www/minibar/minibar_support.js
rename to src/compiler/www/minibar/minibar_support.js
diff --git a/src/www/minibar/minibar_translations.js b/src/compiler/www/minibar/minibar_translations.js
similarity index 100%
rename from src/www/minibar/minibar_translations.js
rename to src/compiler/www/minibar/minibar_translations.js
diff --git a/src/www/minibar/pgf_offline.js b/src/compiler/www/minibar/pgf_offline.js
similarity index 100%
rename from src/www/minibar/pgf_offline.js
rename to src/compiler/www/minibar/pgf_offline.js
diff --git a/src/www/minibar/phrasebook.html b/src/compiler/www/minibar/phrasebook.html
similarity index 100%
rename from src/www/minibar/phrasebook.html
rename to src/compiler/www/minibar/phrasebook.html
diff --git a/src/www/minibar/saldotest.html b/src/compiler/www/minibar/saldotest.html
similarity index 100%
rename from src/www/minibar/saldotest.html
rename to src/compiler/www/minibar/saldotest.html
diff --git a/src/www/minibar/saldotest.js b/src/compiler/www/minibar/saldotest.js
similarity index 100%
rename from src/www/minibar/saldotest.js
rename to src/compiler/www/minibar/saldotest.js
diff --git a/src/www/minibar/tree-btn.png b/src/compiler/www/minibar/tree-btn.png
similarity index 100%
rename from src/www/minibar/tree-btn.png
rename to src/compiler/www/minibar/tree-btn.png
diff --git a/src/www/robots.txt b/src/compiler/www/robots.txt
similarity index 100%
rename from src/www/robots.txt
rename to src/compiler/www/robots.txt
diff --git a/src/www/syntax-editor/Makefile b/src/compiler/www/syntax-editor/Makefile
similarity index 100%
rename from src/www/syntax-editor/Makefile
rename to src/compiler/www/syntax-editor/Makefile
diff --git a/src/www/syntax-editor/README.md b/src/compiler/www/syntax-editor/README.md
similarity index 100%
rename from src/www/syntax-editor/README.md
rename to src/compiler/www/syntax-editor/README.md
diff --git a/src/www/syntax-editor/about.html b/src/compiler/www/syntax-editor/about.html
similarity index 100%
rename from src/www/syntax-editor/about.html
rename to src/compiler/www/syntax-editor/about.html
diff --git a/src/www/syntax-editor/ast.js b/src/compiler/www/syntax-editor/ast.js
similarity index 100%
rename from src/www/syntax-editor/ast.js
rename to src/compiler/www/syntax-editor/ast.js
diff --git a/src/www/syntax-editor/editor.css b/src/compiler/www/syntax-editor/editor.css
similarity index 100%
rename from src/www/syntax-editor/editor.css
rename to src/compiler/www/syntax-editor/editor.css
diff --git a/src/www/syntax-editor/editor.html b/src/compiler/www/syntax-editor/editor.html
similarity index 100%
rename from src/www/syntax-editor/editor.html
rename to src/compiler/www/syntax-editor/editor.html
diff --git a/src/www/syntax-editor/editor.js b/src/compiler/www/syntax-editor/editor.js
similarity index 100%
rename from src/www/syntax-editor/editor.js
rename to src/compiler/www/syntax-editor/editor.js
diff --git a/src/www/syntax-editor/editor_menu.js b/src/compiler/www/syntax-editor/editor_menu.js
similarity index 100%
rename from src/www/syntax-editor/editor_menu.js
rename to src/compiler/www/syntax-editor/editor_menu.js
diff --git a/src/www/syntax-editor/editor_online.js b/src/compiler/www/syntax-editor/editor_online.js
similarity index 100%
rename from src/www/syntax-editor/editor_online.js
rename to src/compiler/www/syntax-editor/editor_online.js
diff --git a/src/www/translator/about.html b/src/compiler/www/translator/about.html
similarity index 100%
rename from src/www/translator/about.html
rename to src/compiler/www/translator/about.html
diff --git a/src/www/translator/index.html b/src/compiler/www/translator/index.html
similarity index 100%
rename from src/www/translator/index.html
rename to src/compiler/www/translator/index.html
diff --git a/src/www/translator/overlay.css b/src/compiler/www/translator/overlay.css
similarity index 100%
rename from src/www/translator/overlay.css
rename to src/compiler/www/translator/overlay.css
diff --git a/src/www/translator/translator.css b/src/compiler/www/translator/translator.css
similarity index 100%
rename from src/www/translator/translator.css
rename to src/compiler/www/translator/translator.css
diff --git a/src/www/translator/translator.js b/src/compiler/www/translator/translator.js
similarity index 100%
rename from src/www/translator/translator.js
rename to src/compiler/www/translator/translator.js
diff --git a/src/www/wc.html b/src/compiler/www/wc.html
similarity index 100%
rename from src/www/wc.html
rename to src/compiler/www/wc.html