diff --git a/README.md b/README.md
index 1965836..f15f614 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,169 @@
-This repo contains basic examples of Ximera constructs that can be used as
-* demo
-* tests
+This Repo contains the master testbed for Ximera development.
+It also contains minimal examples and syntax for the Ximera commands, environments, etc.
+However, for a much in-depth treatment of Ximera commands, environments, etc you should
+refer to the Ximera manual, which explains things in more detail and in a more user friendly way.
+
+# General Structure and Intent of this Repo
+
+* **This Repo (will eventually be) structured as follows...**
+
+- depreciated (for content that is being removed in a future release, see README in folder)
+ - (DTXFileName)Test.tex files (e.g. problemTest.tex)
+- testFiles
+ -compositeTestFiles (for tests of interactions between different dtx file contents, see README in folder.)
+ -subfolder named to explain composite testing case.
+ -dtxTestFiles (for individual dtx file testbeds, see README in folder.)
+ - (Command/Env) folder; a folder for each testable command/enviroment/etc. (e.g. ''problem'' folder)
+ - base.tex file (basic usage implementation/info)
+ - (Additional Testing Feature).tex (e.g. nesting.tex or numbering.tex in the problem folder)
+- testXourses (xourse files to lode relevant test files, see README in folder)
+ - compositeTestXourses (xourses for testing interactions between different dtx files)
+ - dtxTestXourses (xourses for testing individual dtx file contents)
+ - (dtxFileName)Test.tex is the xourse that tests (dtxFileName) dtx file.
+ - Includes hard coded non-tested content so it is easy to verify all non-depreciated dtx has been parsed.
+
+* **testFiles Folder at a glance**
+The testFiles folder is the folder that contains all the actual test ximera document class files
+that are loaded and used for demo/testing. There are two subfolders in this folder.
+1) The dtxTestFiles are the files that test individual dtx files to verify the integrity of all
+the elements within that specific dtx file.
+2) The compositeTestFiles subfolder is for files that test the integrity of elements that span
+and/or interact between different dtx files.
+
+* **testXourses Folder at a glance**
+The testXourses is the location of all the xourse files. There are two subfolders;
+1) The first subfolder is the dtxTestXourses subfolder. It is a subfolder for xourses that are
+tests for each of the dtx files, these xourses should load all the relevant test files to verify
+the functionality of all the elements that are touched by that dtx file.
+2) The other subfolder is the compositeTestXourses folder, which are xourses that load all the relevant
+tests to verify the integrity of how elements in different dtx files interact with each other. These
+should load each of the relevant test files in the corresponding compositeTestFiles subfolder
+of the testFiles folder.
+
+
+
+
+# Naming Schemes
+
+* **Each test xourse in the testXourses/dtxTestXourses is named after a dtx file.**
+Since all development work must be implemented via dtx file (as per CTAN standards) and most development work
+tends to involve only a few dtx files (usually just one or two), it is often easiest to test the new code by testing
+everything that is implemented by the newly changed dtx code. This testing bed makes that easy to accomplish by merely
+pulling up the relevant dtxTestXourse(s) and loading thetest bed xourse(s) that correspond to your changed dtx file.
+These in turn load all the relevant testFiles that correspond to the individual elements implemented by that dtx file
+i.e. each command/environment (or reasonably obvious groupings, like all ``\newtheorem`` generated environments are
+in the same place) has its own testing tile, making it relatively easy to investigate updated content, even inside a given dtx.
+Thus **Each dtxTestXourse should be named (dtxFileName)Test.tex** e.g. ''abstractTest.tex'' for the ''abstract.dtx'' file.
+
+* **Each tested command/env/etc has a file in the relevant (subfolder) of the dtxTestFiles Folder**
+Each command/environment/etc (referred to as ``element``) that is implemented in a dtx should have its own testFile
+in that dtxTestFiles subfolder, named after the relevant element. This should demo/test the most basic form of the
+element.
+However, often there are a number of options, or other elements for whatever is being tested that also need a demo/test.
+We don't want to have a single test file that contains all the various complexities of these things,
+as it becomes difficult to see what aspect ended up generating issues (if there are issues from testing).
+Thus test files should have the ''base.tex'' file that is the minimal implementation of the tested item, and then various
+other files that demo/test the other relevant aspects, each named after whatever it tests (e.g. ''numbering'' or ''nesting''
+for demo/testing the numbering scheme and nesting behavior inside the problem subfolder in the testFiles folder.).
+
+* **When Preambles are Necessary**
+Some specific test files/xourses need to load specific options or alternative files as part of their
+testing (e.g. the graphics testing file needs to input graphics, and set graphics paths in the preamble). When this is
+necessary, **do note use the xmpreamble** for the test repo - instead you should make a preamble with the relevant test
+file (or xourse as appropriate) name, appended with ''preamble'' - e.g. ''imagePreamble.tex'' is the preamble file
+for the image.tex test file.
+Similarly, some specific elements have (intended) different behavior depending on server source (e.g. UF, OSU, KL, etc).
+In this case, you should add another test file with the intended behavior specific to the server source, and append the
+server name/code to the test file. For example, if OSU has intended behavior that differs from ximera base for hints,
+then there should be a ''hintsOSU'' or possibly a ''hintsBaseOSU'' as appropriate.
+
+* **Example of Intended Naming Scheme:**
+To demonstrate the intended naming scheme, consider the problem-like environments. The thing being tested is the ''problem''
+environment, so all tests go into a ''problem'' folder inside the testFiles folder. We need the base case that
+demo/tests the very bare implementation of the problem like environments - but it also requires a test for how problem
+numbering is handled, and a test for how nesting problems is handled. Thus there should be three test files inside the problem
+subfolder of the testFiles folder; problemBase.tex, problemNesting.tex, and problemNumbering.tex.
+each is a ximera documentclass that is demoing/testing the basic implementation, nesting behavior,
+and numbering scheme respectivvely. These are in turn loaded by the
+''problemTest.tex'' file, which is the xourse documentclass that loads the content generated in the problem.dtx file.
+So just the ''problem'' related files would be in the structure as follows:
+- testXourses
+ - problemTest.tex
+- testFiles
+ - problem
+ - base.tex file (basic usage implementation/info)
+ - nesting.tex (demo/test for nesting behavior)
+ - numbering.tex (demo/test for numbering scheme)
+
+# Creating a New Test File
+If you have determined a meaningful test case that has no appropriate test file, you can do the following;
+1) You should post the issue on the github issues tab of the example repo (**NOT** the ximeraLatex repo!) with
+a detailed explanation of what you need to test - make sure to highlight exactly the things that need to be
+tested that are not currently testable using the existing test files. In other words, make sure to include:
+ - What is currently not able to be tested using existing test files.
+ - What specifically you are trying to test overall (in the case that the part that is `untestable` is
+ only a piece of what you are trying to test overall).
+ - Why you are trying to test and/or what you are trying to change about Ximera that needs testing.
+2) Next - if you are able, you should make a branch of the main examples repo, and write your new test file.
+Once you have the new test file written (and tested) and think it is ready to be merged, submit a pull request
+with an explanation of what and how you are going about testing the thing you are submitting a new file for,
+along with a reference to the github issue in the examples repo that you submitted from part 1. This will
+allow another developer to quickly and easily review the file for submission and then merge it.
+ - As a general rule, a different developer (than the author of the new file) should review/merge
+ a new test file for safety.
+ - New test files should be verified to make sure they are necessary, suitably succinct in their testing,
+ and conform to the various naming and design requirements listed in this readme.
+ - Once the merge has been completed, whomever reviewed the test file and merged the new test file into
+ the master test repo *must* be the one to close the github issue. This will help with quickly referencing
+ who did what if there are any issues later on or if someone needs to verify something (helps minimize
+ digging through the commit history).
+
+# Non-Testable dtx Files Explained
+
+Each dtx file should have its own test xourse that loads the relevant test files. However, pending a reorganization
+of dtx files and their content, there are currently many dtx files that do not contain any testable commands or environments
+(for example, the banner.dtx file is just the ascii definition of the banner that displays in the console on page load).
+Nonetheless it is important to know that a given dtx file has been parsed and any necessary content have relevant test files.
+So we still make test files for non-testable dtx files (e.g. BannerTest.tex) but place that file in a special top-level folder
+called ''untestedDTX'' which contains two different types of non-tested files. There are depreciated dtx files - those dtx
+files whose contents will be removed in an upcoming ximera version and so tests aren't needed (these are separated into
+a 'depreciated' folder inside the untestedDTX folder) as well as the dtx files that do not contain anything that can/need
+be tested (like the banner.dtx) - test files for these are put in the ''hardCoded'' subfolder of the untestedDTX folder.
+
+
+# Public Publishing Locations
+
+Content from this repo is published publically for others to see, and link to. This is mostly as a quick-ref demo resource
+for authors, but can be used by anyone - it is publically available after all. You can find these servers here:
-The main branch is published
* at [KU Leuven](https://set-p-dsb-zomercursus-latest.cloud-ext.icts.kuleuven.be/ximeraexamples/coreXimeraFeatures/environments/theoremEnvironments).
* at [OSU](https://ximera.osu.edu/ximeraexamples).
Note you can always get the TeX-code by appending .tex to the URL of an activity.
-A more detailed description of how to use this repo for testing is in the [README_testing](README_testing.md)
+
+
+# Notes from talking with Wim
+
+1) Make a ``global testing files`` type subfolder in the testFiles folder for test files that are designed
+to test more global interactions - not things that are contianed within a single dtx file.
+For example, the label/ref interactions with certain environments like theorems or problems; or
+complicated ToC implementation with nesting sections/subsections and chapterstyle/sectionstyle commands.
+
+
+
diff --git a/outcomes/outcome.tex b/outcomes/outcome.tex
deleted file mode 100644
index 90ea29f..0000000
--- a/outcomes/outcome.tex
+++ /dev/null
@@ -1,55 +0,0 @@
-\documentclass{ximera}
-\title{Outcome Default List Test Activity}
-\date{Last Updated: 6/5/2025}
-
-% List of outcomes that should display where "\displayOutcomes" is used.
-\outcome{Answer some questions about some stuff.}
-\outcome{Do something productive.}
-\outcome{Learn how Questions work maybe.}
-\outcome{Maybe other stuff - who knows!}
-%\input{preamble.tex}
-\begin{document}
-\begin{abstract}
- A testbed file for Outcomes.
-\end{abstract}
-\maketitle
-
-\section{Intended Outcome of Test}
-
-In the preamble we use the \verb|\outcome| command to add an outcome, and add a new outcome with each \verb|\outcome| command.
-Then we use the \verb|\displayOutcomes| command to display the outcomes listed in this file.
-The command \verb|\displayOutcomes| takes an optional argument to load an outcome file from a different file (if it exists).
-
-So, in the preamble, we used the following commands to populate the outcomes:
-\begin{itemize}
- \item \verb|\outcome{Answer some questions about some stuff.} |
- \item \verb|\outcome{Do something productive.} |
- \item \verb|\outcome{Learn how Questions work maybe.} |
- \item \verb|\outcome{Maybe other stuff - who knows!} |
-\end{itemize}
-
-
-The test area should look (approximately) like the following:
-
-
-Goals for this Section (Hover over me to see!)\\
-At the end of this section, students should be able to...
-\begin{itemize}
-\item Answer some questions about some stuff.
-\item Do something productive.
-\item Learn how Questions work maybe.
-\item Maybe other stuff - who knows!
-\end{itemize}
-So go forth and learn!
-
-
-
-\section{Start of Test/Demo Area}
-
-\displayOutcomes
-
-\section{End of Test/Demo Area}
-
-Some ending text to ensure that there is no unintended output between end of the test/demo and the end of the document.
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses.TODO/preamble.tex b/savedArchive/Templates/preamble.tex
similarity index 100%
rename from testXourses.TODO/preamble.tex
rename to savedArchive/Templates/preamble.tex
diff --git a/testXourses.TODO/testFiles/placeHolder.tex b/savedArchive/Templates/testFiles/placeHolder.tex
similarity index 93%
rename from testXourses.TODO/testFiles/placeHolder.tex
rename to savedArchive/Templates/testFiles/placeHolder.tex
index 19720df..490cef8 100644
--- a/testXourses.TODO/testFiles/placeHolder.tex
+++ b/savedArchive/Templates/testFiles/placeHolder.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\title{Template}
%\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
diff --git a/testXourses.TODO/testFiles/preamble.tex b/savedArchive/Templates/testFiles/preamble.tex
similarity index 100%
rename from testXourses.TODO/testFiles/preamble.tex
rename to savedArchive/Templates/testFiles/preamble.tex
diff --git a/testXourses.TODO/xmPreamble.tex b/savedArchive/Templates/xmPreamble.tex
similarity index 100%
rename from testXourses.TODO/xmPreamble.tex
rename to savedArchive/Templates/xmPreamble.tex
diff --git a/coreXimeraFeatures.tex b/savedArchive/coreXimeraFeatures.tex
similarity index 96%
rename from coreXimeraFeatures.tex
rename to savedArchive/coreXimeraFeatures.tex
index 3971630..2db1280 100644
--- a/coreXimeraFeatures.tex
+++ b/savedArchive/coreXimeraFeatures.tex
@@ -1,4 +1,4 @@
-\documentclass[numbers]{xourse}
+%\documentclass[numbers]{xourse}
\input{preamble.tex}
diff --git a/environments/answer.tex b/savedArchive/environments/answer.tex
similarity index 96%
rename from environments/answer.tex
rename to savedArchive/environments/answer.tex
index fe1db26..9951355 100644
--- a/environments/answer.tex
+++ b/savedArchive/environments/answer.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble.tex}
diff --git a/environments/choiceAnswer.tex b/savedArchive/environments/choiceAnswer.tex
similarity index 98%
rename from environments/choiceAnswer.tex
rename to savedArchive/environments/choiceAnswer.tex
index 0f8c27c..3ab92c2 100644
--- a/environments/choiceAnswer.tex
+++ b/savedArchive/environments/choiceAnswer.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
\title{Choice answers}
diff --git a/environments/dialogue.tex b/savedArchive/environments/dialogue.tex
similarity index 92%
rename from environments/dialogue.tex
rename to savedArchive/environments/dialogue.tex
index c433710..15f2abf 100644
--- a/environments/dialogue.tex
+++ b/savedArchive/environments/dialogue.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/environments/feedback.tex b/savedArchive/environments/feedback.tex
similarity index 98%
rename from environments/feedback.tex
rename to savedArchive/environments/feedback.tex
index 980ce5f..463a7c2 100644
--- a/environments/feedback.tex
+++ b/savedArchive/environments/feedback.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/environments/hints.tex b/savedArchive/environments/hints.tex
similarity index 93%
rename from environments/hints.tex
rename to savedArchive/environments/hints.tex
index a25fa80..6f08fc6 100644
--- a/environments/hints.tex
+++ b/savedArchive/environments/hints.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/environments/problemEnvironments.tex b/savedArchive/environments/problemEnvironments.tex
similarity index 98%
rename from environments/problemEnvironments.tex
rename to savedArchive/environments/problemEnvironments.tex
index 246f0ce..ccc51d0 100644
--- a/environments/problemEnvironments.tex
+++ b/savedArchive/environments/problemEnvironments.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/environments/theoremEnvironments.tex b/savedArchive/environments/theoremEnvironments.tex
similarity index 99%
rename from environments/theoremEnvironments.tex
rename to savedArchive/environments/theoremEnvironments.tex
index f5001b7..7ad620b 100644
--- a/environments/theoremEnvironments.tex
+++ b/savedArchive/environments/theoremEnvironments.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\outcome{Theorem environments.}
\input{../preamble}
\author{Bart Snapp \and Rodney Austin}
diff --git a/examples.TODO/graphicsAndVideos/chimera.jpg b/savedArchive/examples.TODO/graphicsAndVideos/chimera.jpg
similarity index 100%
rename from examples.TODO/graphicsAndVideos/chimera.jpg
rename to savedArchive/examples.TODO/graphicsAndVideos/chimera.jpg
diff --git a/examples.TODO/graphicsAndVideos/dna.jpg b/savedArchive/examples.TODO/graphicsAndVideos/dna.jpg
similarity index 100%
rename from examples.TODO/graphicsAndVideos/dna.jpg
rename to savedArchive/examples.TODO/graphicsAndVideos/dna.jpg
diff --git a/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex b/savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
similarity index 99%
rename from examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
rename to savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
index 983ee2b..34daac9 100644
--- a/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
+++ b/savedArchive/examples.TODO/graphicsAndVideos/graphicsAndVideos.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
\title{Graphics and videos}
diff --git a/examples.TODO/hidingText/hidingText.tex b/savedArchive/examples.TODO/hidingText/hidingText.tex
similarity index 93%
rename from examples.TODO/hidingText/hidingText.tex
rename to savedArchive/examples.TODO/hidingText/hidingText.tex
index 4d533b2..df6d2e1 100644
--- a/examples.TODO/hidingText/hidingText.tex
+++ b/savedArchive/examples.TODO/hidingText/hidingText.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/examples.TODO/math/math.tex b/savedArchive/examples.TODO/math/math.tex
similarity index 95%
rename from examples.TODO/math/math.tex
rename to savedArchive/examples.TODO/math/math.tex
index 1de8117..71ae1e2 100644
--- a/examples.TODO/math/math.tex
+++ b/savedArchive/examples.TODO/math/math.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/examples.TODO/preamble.tex b/savedArchive/examples.TODO/preamble.tex
similarity index 100%
rename from examples.TODO/preamble.tex
rename to savedArchive/examples.TODO/preamble.tex
diff --git a/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex b/savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
similarity index 99%
rename from examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
rename to savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
index de5096a..0496fa2 100644
--- a/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
+++ b/savedArchive/examples.TODO/theoremEnvironments/2-1-3LinearEquations_Forms.tex
@@ -1,4 +1,4 @@
-\documentclass[nooutcomes]{ximera}
+%\documentclass[nooutcomes]{ximera}
\input{../preamble.tex}
\author{Elizabeth Miller}
%\license{Creative Commons Attribution 4.0 International License}
diff --git a/examples.TODO/titles/titles.tex b/savedArchive/examples.TODO/titles/titles.tex
similarity index 97%
rename from examples.TODO/titles/titles.tex
rename to savedArchive/examples.TODO/titles/titles.tex
index f8dc838..bf9a1b5 100644
--- a/examples.TODO/titles/titles.tex
+++ b/savedArchive/examples.TODO/titles/titles.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/examples.TODO/xkcd/xkcd.tex b/savedArchive/examples.TODO/xkcd/xkcd.tex
similarity index 96%
rename from examples.TODO/xkcd/xkcd.tex
rename to savedArchive/examples.TODO/xkcd/xkcd.tex
index 6bcee86..4010c9e 100644
--- a/examples.TODO/xkcd/xkcd.tex
+++ b/savedArchive/examples.TODO/xkcd/xkcd.tex
@@ -1,4 +1,4 @@
-\documentclass{ximera}
+%\documentclass{ximera}
\input{../preamble}
diff --git a/testFiles/compositeTestFiles/README.md b/testFiles/compositeTestFiles/README.md
new file mode 100644
index 0000000..7d2efe4
--- /dev/null
+++ b/testFiles/compositeTestFiles/README.md
@@ -0,0 +1,25 @@
+# Intent/Summary of This Folder
+This folder will contain test files for those structures that we need to
+test, that involve expansive interactions between several different
+elements contained within different dtx structures. For example, we should
+have a test file to test the interaction between the label/ref system
+and theorems, problems, explanations, and other environments that might
+need to be referenced/cited. These environments are all implemented
+across several dtx files, so there isn't a nice way to test them using the
+dtx-specific test files
+
+# Organization Scheme
+The testfiles that will be in this folder are not naturally separable,
+since - by their nature - they are compositions of many different dtx files.
+However, these test files should arise naturally out of a more global concern
+(e.g. ``how does label/referencing interact with environments?``), so the
+author of test files for this area should try their best to create and name
+a (sub)folder so that others can guess what kind of thing the files inside
+are testing. Each composite test situation is again likely to have a number
+of test files for different aspects of the testing of that situation
+(e.g. a file to test label/ref with problem-like envs, another for
+theorem-like envs, another for expository-like envs, etc), so each
+composite test should have its own subfolder, containing the test files.
+Ideally the xourse for composite test files should go into the testGroupings
+folder.
+
diff --git a/testFiles/dtxTestFiles/README.md b/testFiles/dtxTestFiles/README.md
new file mode 100644
index 0000000..da17973
--- /dev/null
+++ b/testFiles/dtxTestFiles/README.md
@@ -0,0 +1,15 @@
+# Intent/Summary of This Folder
+This folder is intended to have the test files that (completely) test the
+individual dtx files in isolation. These are likely to be the most used/important
+test files as development is *usually* isolated to individual dtx files,
+rather than more sweeping composite changes that impact many different types
+of files simultaneously.
+
+# Organization Scheme
+This folder should mirror the dtx structure of the ximera package, so that
+one can find the dtx file to test by tracing the same folder pathway as the
+dtx file that they were editing. The only difference is that the dtx file
+in the ximera package is now a folder, as individual dtx files can have
+several different test files to account for several testing aspects within
+that test file (e.g. the problem.dtx has base.tex, numbering.tex and
+nesting.tex testing files).
\ No newline at end of file
diff --git a/testXourses/testFiles/abstract.tex b/testFiles/dtxTestFiles/abstract/base.tex
similarity index 100%
rename from testXourses/testFiles/abstract.tex
rename to testFiles/dtxTestFiles/abstract/base.tex
diff --git a/testXourses/testFiles/activity.tex b/testFiles/dtxTestFiles/activity/base.tex
similarity index 100%
rename from testXourses/testFiles/activity.tex
rename to testFiles/dtxTestFiles/activity/base.tex
diff --git a/testXourses/testFiles/activityNoTitle.tex b/testFiles/dtxTestFiles/activity/noTitle.tex
similarity index 100%
rename from testXourses/testFiles/activityNoTitle.tex
rename to testFiles/dtxTestFiles/activity/noTitle.tex
diff --git a/testXourses/testFiles/practice.tex b/testFiles/dtxTestFiles/activity/practice.tex
similarity index 100%
rename from testXourses/testFiles/practice.tex
rename to testFiles/dtxTestFiles/activity/practice.tex
diff --git a/testXourses/testFiles/answerBase.tex b/testFiles/dtxTestFiles/answer/base.tex
similarity index 100%
rename from testXourses/testFiles/answerBase.tex
rename to testFiles/dtxTestFiles/answer/base.tex
diff --git a/testXourses/testFiles/answerOptionals.tex b/testFiles/dtxTestFiles/answer/optionals.tex
similarity index 100%
rename from testXourses/testFiles/answerOptionals.tex
rename to testFiles/dtxTestFiles/answer/optionals.tex
diff --git a/testXourses/testFiles/choiceBase.tex b/testFiles/dtxTestFiles/choice/base.tex
similarity index 100%
rename from testXourses/testFiles/choiceBase.tex
rename to testFiles/dtxTestFiles/choice/base.tex
diff --git a/testXourses/testFiles/clearHideEnv.tex b/testFiles/dtxTestFiles/clearHideEnv/base.tex
similarity index 100%
rename from testXourses/testFiles/clearHideEnv.tex
rename to testFiles/dtxTestFiles/clearHideEnv/base.tex
diff --git a/testXourses/testFiles/desmosBase.tex b/testFiles/dtxTestFiles/desmos/base.tex
similarity index 100%
rename from testXourses/testFiles/desmosBase.tex
rename to testFiles/dtxTestFiles/desmos/base.tex
diff --git a/testXourses/testFiles/dialogue.tex b/testFiles/dtxTestFiles/dialogue/base.tex
similarity index 100%
rename from testXourses/testFiles/dialogue.tex
rename to testFiles/dtxTestFiles/dialogue/base.tex
diff --git a/testXourses/dtxFileContentInteractionList.txt b/testFiles/dtxTestFiles/dtxFileContentInteractionList.txt
similarity index 100%
rename from testXourses/dtxFileContentInteractionList.txt
rename to testFiles/dtxTestFiles/dtxFileContentInteractionList.txt
diff --git a/testXourses/testFiles/expandable.tex b/testFiles/dtxTestFiles/expandable/base.tex
similarity index 100%
rename from testXourses/testFiles/expandable.tex
rename to testFiles/dtxTestFiles/expandable/base.tex
diff --git a/testXourses/testFiles/foldableEnvironments.tex b/testFiles/dtxTestFiles/expandable/foldableEnvironments.tex
similarity index 100%
rename from testXourses/testFiles/foldableEnvironments.tex
rename to testFiles/dtxTestFiles/expandable/foldableEnvironments.tex
diff --git a/testXourses/testFiles/foldableEnvironmentsOSU.tex b/testFiles/dtxTestFiles/expandable/foldableEnvironmentsOSU.tex
similarity index 100%
rename from testXourses/testFiles/foldableEnvironmentsOSU.tex
rename to testFiles/dtxTestFiles/expandable/foldableEnvironmentsOSU.tex
diff --git a/testXourses/testFiles/feedbackBasic.tex b/testFiles/dtxTestFiles/feedback/base.tex
similarity index 100%
rename from testXourses/testFiles/feedbackBasic.tex
rename to testFiles/dtxTestFiles/feedback/base.tex
diff --git a/testXourses/testFiles/footnotes.tex b/testFiles/dtxTestFiles/footnotes/base.tex
similarity index 100%
rename from testXourses/testFiles/footnotes.tex
rename to testFiles/dtxTestFiles/footnotes/base.tex
diff --git a/testXourses/testFiles/freeresponseBase.tex b/testFiles/dtxTestFiles/freeResponse/base.tex
similarity index 100%
rename from testXourses/testFiles/freeresponseBase.tex
rename to testFiles/dtxTestFiles/freeResponse/base.tex
diff --git a/testXourses/testFiles/geogebraBase.tex b/testFiles/dtxTestFiles/geogebra/base.tex
similarity index 100%
rename from testXourses/testFiles/geogebraBase.tex
rename to testFiles/dtxTestFiles/geogebra/base.tex
diff --git a/testXourses/testFiles/googleBase.tex b/testFiles/dtxTestFiles/google/base.tex
similarity index 100%
rename from testXourses/testFiles/googleBase.tex
rename to testFiles/dtxTestFiles/google/base.tex
diff --git a/testXourses/testFiles/graph.tex b/testFiles/dtxTestFiles/graph/base.tex
similarity index 100%
rename from testXourses/testFiles/graph.tex
rename to testFiles/dtxTestFiles/graph/base.tex
diff --git a/hardCoded/hardCodedContent.tex b/testFiles/dtxTestFiles/hardCodedContent.tex
similarity index 100%
rename from hardCoded/hardCodedContent.tex
rename to testFiles/dtxTestFiles/hardCodedContent.tex
diff --git a/testXourses/testFiles/hintsBase.tex b/testFiles/dtxTestFiles/hints/base.tex
similarity index 100%
rename from testXourses/testFiles/hintsBase.tex
rename to testFiles/dtxTestFiles/hints/base.tex
diff --git a/testXourses/testFiles/hintsBaseOSU.tex b/testFiles/dtxTestFiles/hints/baseOSU.tex
similarity index 100%
rename from testXourses/testFiles/hintsBaseOSU.tex
rename to testFiles/dtxTestFiles/hints/baseOSU.tex
diff --git a/testXourses/testFiles/imageBase.tex b/testFiles/dtxTestFiles/image/base.tex
similarity index 100%
rename from testXourses/testFiles/imageBase.tex
rename to testFiles/dtxTestFiles/image/base.tex
diff --git a/testFiles/dtxTestFiles/image/imagePreamble.tex b/testFiles/dtxTestFiles/image/imagePreamble.tex
new file mode 100644
index 0000000..f2fd807
--- /dev/null
+++ b/testFiles/dtxTestFiles/image/imagePreamble.tex
@@ -0,0 +1,6 @@
+%\usepackage{svg}
+\graphicspath{
+{./}
+{./missionPatch/}% Path from the ximera document file to the image file(s)
+{../../testFiles/dtxTestFiles/image/missionPatch/}% Path from the xourse file to image file(s).
+}
\ No newline at end of file
diff --git a/testXourses/testFiles/missionPatch/missionPatch.jpg b/testFiles/dtxTestFiles/image/missionPatch/missionPatch.jpg
similarity index 100%
rename from testXourses/testFiles/missionPatch/missionPatch.jpg
rename to testFiles/dtxTestFiles/image/missionPatch/missionPatch.jpg
diff --git a/testFiles/dtxTestFiles/image/missionPatch/missionPatch.pdf b/testFiles/dtxTestFiles/image/missionPatch/missionPatch.pdf
new file mode 100644
index 0000000..b513b65
Binary files /dev/null and b/testFiles/dtxTestFiles/image/missionPatch/missionPatch.pdf differ
diff --git a/testFiles/dtxTestFiles/image/missionPatch/missionPatch.png b/testFiles/dtxTestFiles/image/missionPatch/missionPatch.png
new file mode 100644
index 0000000..43e634e
Binary files /dev/null and b/testFiles/dtxTestFiles/image/missionPatch/missionPatch.png differ
diff --git a/testXourses/testFiles/instructorNotes.tex b/testFiles/dtxTestFiles/instructorNotes/base.tex
similarity index 100%
rename from testXourses/testFiles/instructorNotes.tex
rename to testFiles/dtxTestFiles/instructorNotes/base.tex
diff --git a/testXourses/testFiles/javascript.tex b/testFiles/dtxTestFiles/javascript/base.tex
similarity index 100%
rename from testXourses/testFiles/javascript.tex
rename to testFiles/dtxTestFiles/javascript/base.tex
diff --git a/link/README.md b/testFiles/dtxTestFiles/link/README.md
similarity index 100%
rename from link/README.md
rename to testFiles/dtxTestFiles/link/README.md
diff --git a/link/link.tex b/testFiles/dtxTestFiles/link/base.tex
similarity index 100%
rename from link/link.tex
rename to testFiles/dtxTestFiles/link/base.tex
diff --git a/localization/basic.tex b/testFiles/dtxTestFiles/localization/basic.tex
similarity index 100%
rename from localization/basic.tex
rename to testFiles/dtxTestFiles/localization/basic.tex
diff --git a/localization/brazil/basic.tex b/testFiles/dtxTestFiles/localization/brazil/basic.tex
similarity index 100%
rename from localization/brazil/basic.tex
rename to testFiles/dtxTestFiles/localization/brazil/basic.tex
diff --git a/localization/brazil/xmPreamble.tex b/testFiles/dtxTestFiles/localization/brazil/xmPreamble.tex
similarity index 100%
rename from localization/brazil/xmPreamble.tex
rename to testFiles/dtxTestFiles/localization/brazil/xmPreamble.tex
diff --git a/localization/dutch/basic.tex b/testFiles/dtxTestFiles/localization/dutch/basic.tex
similarity index 100%
rename from localization/dutch/basic.tex
rename to testFiles/dtxTestFiles/localization/dutch/basic.tex
diff --git a/localization/dutch/xmPreamble.tex b/testFiles/dtxTestFiles/localization/dutch/xmPreamble.tex
similarity index 100%
rename from localization/dutch/xmPreamble.tex
rename to testFiles/dtxTestFiles/localization/dutch/xmPreamble.tex
diff --git a/localization/french/basic.tex b/testFiles/dtxTestFiles/localization/french/basic.tex
similarity index 100%
rename from localization/french/basic.tex
rename to testFiles/dtxTestFiles/localization/french/basic.tex
diff --git a/localization/french/xmPreamble.tex b/testFiles/dtxTestFiles/localization/french/xmPreamble.tex
similarity index 100%
rename from localization/french/xmPreamble.tex
rename to testFiles/dtxTestFiles/localization/french/xmPreamble.tex
diff --git a/testXourses/testFiles/localization.tex b/testFiles/dtxTestFiles/localization/localization.tex
similarity index 100%
rename from testXourses/testFiles/localization.tex
rename to testFiles/dtxTestFiles/localization/localization.tex
diff --git a/testXourses/testFiles/localizationPreamble.tex b/testFiles/dtxTestFiles/localization/localizationPreamble.tex
similarity index 100%
rename from testXourses/testFiles/localizationPreamble.tex
rename to testFiles/dtxTestFiles/localization/localizationPreamble.tex
diff --git a/localization/multilingual.tex b/testFiles/dtxTestFiles/localization/multilingual.tex
similarity index 100%
rename from localization/multilingual.tex
rename to testFiles/dtxTestFiles/localization/multilingual.tex
diff --git a/localization/multilingualPreamble.tex b/testFiles/dtxTestFiles/localization/multilingualPreamble.tex
similarity index 100%
rename from localization/multilingualPreamble.tex
rename to testFiles/dtxTestFiles/localization/multilingualPreamble.tex
diff --git a/testXourses/testFiles/metadata.tex b/testFiles/dtxTestFiles/metadata/base.tex
similarity index 100%
rename from testXourses/testFiles/metadata.tex
rename to testFiles/dtxTestFiles/metadata/base.tex
diff --git a/testXourses/testFiles/metapreamble.tex b/testFiles/dtxTestFiles/metadata/metapreamble.tex
similarity index 100%
rename from testXourses/testFiles/metapreamble.tex
rename to testFiles/dtxTestFiles/metadata/metapreamble.tex
diff --git a/testXourses/testFiles/onlyBase.tex b/testFiles/dtxTestFiles/only/base.tex
similarity index 100%
rename from testXourses/testFiles/onlyBase.tex
rename to testFiles/dtxTestFiles/only/base.tex
diff --git a/outcomes/basic.tex b/testFiles/dtxTestFiles/outcomes/base.tex
similarity index 100%
rename from outcomes/basic.tex
rename to testFiles/dtxTestFiles/outcomes/base.tex
diff --git a/outcomes/outcome2.tex b/testFiles/dtxTestFiles/outcomes/styling.tex
similarity index 100%
rename from outcomes/outcome2.tex
rename to testFiles/dtxTestFiles/outcomes/styling.tex
diff --git a/testXourses/testFiles/problemBase.tex b/testFiles/dtxTestFiles/problem/base.tex
similarity index 100%
rename from testXourses/testFiles/problemBase.tex
rename to testFiles/dtxTestFiles/problem/base.tex
diff --git a/testXourses/testFiles/problemNesting.tex b/testFiles/dtxTestFiles/problem/nesting.tex
similarity index 100%
rename from testXourses/testFiles/problemNesting.tex
rename to testFiles/dtxTestFiles/problem/nesting.tex
diff --git a/testXourses/testFiles/problemNumbering.tex b/testFiles/dtxTestFiles/problem/numbering.tex
similarity index 99%
rename from testXourses/testFiles/problemNumbering.tex
rename to testFiles/dtxTestFiles/problem/numbering.tex
index 870f76a..23e2584 100644
--- a/testXourses/testFiles/problemNumbering.tex
+++ b/testFiles/dtxTestFiles/problem/numbering.tex
@@ -1,7 +1,7 @@
\documentclass{ximera}
\title{Problem Environment Numbering}
-%\input{preambleProblem.tex}% Only add a preamble file if it is actually necessary for the demo/test.
+%\input{problemPreamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
\begin{document}
\begin{abstract}
A demo and test of basic problem-style environments.
diff --git a/testXourses/testFiles/preambleProblem.tex b/testFiles/dtxTestFiles/problem/problemPreamble.tex
similarity index 100%
rename from testXourses/testFiles/preambleProblem.tex
rename to testFiles/dtxTestFiles/problem/problemPreamble.tex
diff --git a/testXourses/testFiles/proofBase.tex b/testFiles/dtxTestFiles/proof/base.tex
similarity index 100%
rename from testXourses/testFiles/proofBase.tex
rename to testFiles/dtxTestFiles/proof/base.tex
diff --git a/testXourses/testFiles/sagemathBase.tex b/testFiles/dtxTestFiles/sagemath/base.tex
similarity index 100%
rename from testXourses/testFiles/sagemathBase.tex
rename to testFiles/dtxTestFiles/sagemath/base.tex
diff --git a/testXourses/testFiles/solutionBase.tex b/testFiles/dtxTestFiles/solution/base.tex
similarity index 100%
rename from testXourses/testFiles/solutionBase.tex
rename to testFiles/dtxTestFiles/solution/base.tex
diff --git a/testXourses/testFiles/textcolorBase.tex b/testFiles/dtxTestFiles/textcolor/base.tex
similarity index 100%
rename from testXourses/testFiles/textcolorBase.tex
rename to testFiles/dtxTestFiles/textcolor/base.tex
diff --git a/testXourses/testFiles/textcolorCustomColors.tex b/testFiles/dtxTestFiles/textcolor/customColors.tex
similarity index 100%
rename from testXourses/testFiles/textcolorCustomColors.tex
rename to testFiles/dtxTestFiles/textcolor/customColors.tex
diff --git a/testXourses/testFiles/textcolorpreamble.tex b/testFiles/dtxTestFiles/textcolor/textcolorpreamble.tex
similarity index 100%
rename from testXourses/testFiles/textcolorpreamble.tex
rename to testFiles/dtxTestFiles/textcolor/textcolorpreamble.tex
diff --git a/testXourses/testFiles/theoremsBasic.tex b/testFiles/dtxTestFiles/theorems/base.tex
similarity index 100%
rename from testXourses/testFiles/theoremsBasic.tex
rename to testFiles/dtxTestFiles/theorems/base.tex
diff --git a/testXourses/testFiles/titleBase.tex b/testFiles/dtxTestFiles/title/base.tex
similarity index 100%
rename from testXourses/testFiles/titleBase.tex
rename to testFiles/dtxTestFiles/title/base.tex
diff --git a/testXourses/testFiles/validator.tex b/testFiles/dtxTestFiles/validator/base.tex
similarity index 100%
rename from testXourses/testFiles/validator.tex
rename to testFiles/dtxTestFiles/validator/base.tex
diff --git a/testXourses/testFiles/validator2.tex b/testFiles/dtxTestFiles/validator/base2.tex
similarity index 100%
rename from testXourses/testFiles/validator2.tex
rename to testFiles/dtxTestFiles/validator/base2.tex
diff --git a/testXourses/testFiles/videoBase.tex b/testFiles/dtxTestFiles/video/base.tex
similarity index 100%
rename from testXourses/testFiles/videoBase.tex
rename to testFiles/dtxTestFiles/video/base.tex
diff --git a/testXourses/activityTest.tex b/testXourses/activityTest.tex
deleted file mode 100644
index 07454c1..0000000
--- a/testXourses/activityTest.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: activity and practice}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/activity}
-\practice{testFiles/practice}
-\activity{testFiles/activityNoTitle}
-
-
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/answerTest.tex b/testXourses/answerTest.tex
deleted file mode 100644
index 244fa05..0000000
--- a/testXourses/answerTest.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: Answer}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/answerBase}
-\activity{testFiles/answerOptionals}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/compositeTestXourses/embeddings/websiteEmbeddings.tex b/testXourses/compositeTestXourses/embeddings/websiteEmbeddings.tex
new file mode 100644
index 0000000..d86411a
--- /dev/null
+++ b/testXourses/compositeTestXourses/embeddings/websiteEmbeddings.tex
@@ -0,0 +1,15 @@
+\documentclass{xourse}
+
+\title{Website Embeddings}
+\author{Jason}
+%\input{./websiteEmbeddingsPreamble.tex}
+
+\begin{document}
+\activity{../../testFiles/desmos/base.tex}
+\activity{../../testFiles/geogebra/base.tex}
+\activity{../../testFiles/google/base.tex}
+\activity{../../testFiles/sagemath/base.tex}
+\activity{../../testFiles/video/base.tex}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/README.md b/testXourses/dtxTestXourses/README.md
new file mode 100644
index 0000000..a3b38de
--- /dev/null
+++ b/testXourses/dtxTestXourses/README.md
@@ -0,0 +1,16 @@
+# Intent/Summary of This Folder
+This folder will a xourse file for each dtx file in the ximera package,
+named after that dtx folder. This is for testing changes whose impact
+is expected to be within a specific dtx file (e.g. changing how the
+problem-like environments are rendered should only impact the problem.dtx
+file).
+
+# Organization Scheme
+Each file in this folder should have the name of a dtx file from the
+ximera package, appended with ``Test``, e.g. the ``hints.dtx`` file in
+the ximera package is associated with the ``hintsTest.tex`` xourse file
+in this folder. This allows developers to test changes that are only
+expected to impact single dtx file contents.
+For changes that are expected to impact how contents of *different*
+dtx files interrelate (e.g. label/ref across various environments) devs
+should use the xoure files found in the compositeTestXourses folder.
diff --git a/testXourses/abstractTest.tex b/testXourses/dtxTestXourses/abstractTest.tex
similarity index 63%
rename from testXourses/abstractTest.tex
rename to testXourses/dtxTestXourses/abstractTest.tex
index 12722b0..e557cc8 100644
--- a/testXourses/abstractTest.tex
+++ b/testXourses/dtxTestXourses/abstractTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/abstract}
+\activity{../../testFiles/dtxTestFiles/abstract/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/activityTest.tex b/testXourses/dtxTestXourses/activityTest.tex
new file mode 100644
index 0000000..13cb513
--- /dev/null
+++ b/testXourses/dtxTestXourses/activityTest.tex
@@ -0,0 +1,16 @@
+\documentclass{xourse}
+
+\title{Tests: activity and practice}
+
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/activity/base}
+\practice{../../testFiles/dtxTestFiles/activity/practice}
+\activity{../../testFiles/dtxTestFiles/activity/noTitle}
+
+
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/answerTest.tex b/testXourses/dtxTestXourses/answerTest.tex
new file mode 100644
index 0000000..98de4e6
--- /dev/null
+++ b/testXourses/dtxTestXourses/answerTest.tex
@@ -0,0 +1,13 @@
+\documentclass{xourse}
+
+\title{Tests: Answer}
+
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/answer/base}
+\activity{../../testFiles/dtxTestFiles/answer/optionals}
+
+
+\end{document}
\ No newline at end of file
diff --git a/hardCoded/bannerTest.tex b/testXourses/dtxTestXourses/bannerTest.tex
similarity index 65%
rename from hardCoded/bannerTest.tex
rename to testXourses/dtxTestXourses/bannerTest.tex
index f3f82f6..3b77ed4 100644
--- a/hardCoded/bannerTest.tex
+++ b/testXourses/dtxTestXourses/bannerTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/choiceTest.tex b/testXourses/dtxTestXourses/choiceTest.tex
similarity index 64%
rename from testXourses/choiceTest.tex
rename to testXourses/dtxTestXourses/choiceTest.tex
index 5471090..67d3f15 100644
--- a/testXourses/choiceTest.tex
+++ b/testXourses/dtxTestXourses/choiceTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/choiceBase}
+\activity{../../testFiles/dtxTestFiles/choice/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/clearEnvTest.tex b/testXourses/dtxTestXourses/clearHideEnvTest.tex
similarity index 64%
rename from testXourses/clearEnvTest.tex
rename to testXourses/dtxTestXourses/clearHideEnvTest.tex
index 79ec6e9..6fdbdb5 100644
--- a/testXourses/clearEnvTest.tex
+++ b/testXourses/dtxTestXourses/clearHideEnvTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/clearHideEnv}
+\activity{../../testFiles/dtxTestFiles/clearHideEnv/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/desmosTest.tex b/testXourses/dtxTestXourses/desmosTest.tex
similarity index 64%
rename from testXourses/desmosTest.tex
rename to testXourses/dtxTestXourses/desmosTest.tex
index fd6260d..e1b3f8b 100644
--- a/testXourses/desmosTest.tex
+++ b/testXourses/dtxTestXourses/desmosTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/desmosBase}
+\activity{../../testFiles/dtxTestFiles/desmos/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dialogueTest.tex b/testXourses/dtxTestXourses/dialogueTest.tex
similarity index 63%
rename from testXourses/dialogueTest.tex
rename to testXourses/dtxTestXourses/dialogueTest.tex
index 6d81255..dbd7821 100644
--- a/testXourses/dialogueTest.tex
+++ b/testXourses/dtxTestXourses/dialogueTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/dialogue}
+\activity{../../testFiles/dtxTestFiles/dialogue/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/endingTest.tex b/testXourses/dtxTestXourses/endingTest.tex
similarity index 65%
rename from hardCoded/endingTest.tex
rename to testXourses/dtxTestXourses/endingTest.tex
index 0ce7235..5c2e0b6 100644
--- a/hardCoded/endingTest.tex
+++ b/testXourses/dtxTestXourses/endingTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{depreciated}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/enumerateTest.tex b/testXourses/dtxTestXourses/enumerateTest.tex
similarity index 65%
rename from hardCoded/enumerateTest.tex
rename to testXourses/dtxTestXourses/enumerateTest.tex
index bf77ade..75773a4 100644
--- a/hardCoded/enumerateTest.tex
+++ b/testXourses/dtxTestXourses/enumerateTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/feedbackTest.tex b/testXourses/dtxTestXourses/feedbackTest.tex
similarity index 63%
rename from testXourses/feedbackTest.tex
rename to testXourses/dtxTestXourses/feedbackTest.tex
index 20eaec3..1dd0d5a 100644
--- a/testXourses/feedbackTest.tex
+++ b/testXourses/dtxTestXourses/feedbackTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/feedbackBasic}
+\activity{../../testFiles/dtxTestFiles/feedback/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/foldableTest.tex b/testXourses/dtxTestXourses/foldableTest.tex
new file mode 100644
index 0000000..3752059
--- /dev/null
+++ b/testXourses/dtxTestXourses/foldableTest.tex
@@ -0,0 +1,14 @@
+\documentclass{xourse}
+
+\title{Tests: Expandable and Foldable}
+
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/expandable/base}
+\activity{../../testFiles/dtxTestFiles/expandable/foldableEnvironments}
+\activity{../../testFiles/dtxTestFiles/expandable/foldableEnvironmentsOSU}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/footnotesTest.tex b/testXourses/dtxTestXourses/footnotesTest.tex
similarity index 63%
rename from testXourses/footnotesTest.tex
rename to testXourses/dtxTestXourses/footnotesTest.tex
index 00183f2..808654e 100644
--- a/testXourses/footnotesTest.tex
+++ b/testXourses/dtxTestXourses/footnotesTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/footnotes}
+\activity{../../testFiles/dtxTestFiles/footnotes/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/freeresponseTest.tex b/testXourses/dtxTestXourses/freeresponseTest.tex
similarity index 63%
rename from testXourses/freeresponseTest.tex
rename to testXourses/dtxTestXourses/freeresponseTest.tex
index 5b98723..1851025 100644
--- a/testXourses/freeresponseTest.tex
+++ b/testXourses/dtxTestXourses/freeresponseTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/freeresponseBase}
+\activity{../../testFiles/dtxTestFiles/freeResponse/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/geogebraTest.tex b/testXourses/dtxTestXourses/geogebraTest.tex
similarity index 63%
rename from testXourses/geogebraTest.tex
rename to testXourses/dtxTestXourses/geogebraTest.tex
index 5fe9f38..6fddebb 100644
--- a/testXourses/geogebraTest.tex
+++ b/testXourses/dtxTestXourses/geogebraTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/geogebraBase}
+\activity{../../testFiles/dtxTestFiles/geogebra/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/googleTest.tex b/testXourses/dtxTestXourses/googleTest.tex
similarity index 64%
rename from testXourses/googleTest.tex
rename to testXourses/dtxTestXourses/googleTest.tex
index d3ec32a..8b58fe0 100644
--- a/testXourses/googleTest.tex
+++ b/testXourses/dtxTestXourses/googleTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/googleBase}
+\activity{../../testFiles/dtxTestFiles/google/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/graphTest.tex b/testXourses/dtxTestXourses/graphTest.tex
similarity index 64%
rename from testXourses/graphTest.tex
rename to testXourses/dtxTestXourses/graphTest.tex
index 6a5b57c..d5a6c87 100644
--- a/testXourses/graphTest.tex
+++ b/testXourses/dtxTestXourses/graphTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/graph}
+\activity{../../testFiles/dtxTestFiles/graph/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/hintsTest.tex b/testXourses/dtxTestXourses/hintsTest.tex
new file mode 100644
index 0000000..b9a44c1
--- /dev/null
+++ b/testXourses/dtxTestXourses/hintsTest.tex
@@ -0,0 +1,13 @@
+\documentclass{xourse}
+
+\title{Tests: Hints}
+
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/hints/base}
+\activity{../../testFiles/dtxTestFiles/hints/baseOSU}
+
+
+\end{document}
\ No newline at end of file
diff --git a/hardCoded/htmlTest.tex b/testXourses/dtxTestXourses/htmlTest.tex
similarity index 64%
rename from hardCoded/htmlTest.tex
rename to testXourses/dtxTestXourses/htmlTest.tex
index aeb4a1e..2e31f8d 100644
--- a/hardCoded/htmlTest.tex
+++ b/testXourses/dtxTestXourses/htmlTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/hyperrefTest.tex b/testXourses/dtxTestXourses/hyperrefTest.tex
similarity index 65%
rename from hardCoded/hyperrefTest.tex
rename to testXourses/dtxTestXourses/hyperrefTest.tex
index 345a4f0..369d696 100644
--- a/hardCoded/hyperrefTest.tex
+++ b/testXourses/dtxTestXourses/hyperrefTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/imageTest.tex b/testXourses/dtxTestXourses/imageTest.tex
new file mode 100644
index 0000000..2013f26
--- /dev/null
+++ b/testXourses/dtxTestXourses/imageTest.tex
@@ -0,0 +1,12 @@
+\documentclass{xourse}
+
+\title{Tests: Image}
+\input{../../testFiles/dtxTestFiles/image/imagePreamble}
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/image/base}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/instructornotesTest.tex b/testXourses/dtxTestXourses/instructornotesTest.tex
similarity index 62%
rename from testXourses/instructornotesTest.tex
rename to testXourses/dtxTestXourses/instructornotesTest.tex
index a4029d0..2422640 100644
--- a/testXourses/instructornotesTest.tex
+++ b/testXourses/dtxTestXourses/instructornotesTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/instructorNotes}
+\activity{../../testFiles/dtxTestFiles/instructorNotes/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/javascriptTest.tex b/testXourses/dtxTestXourses/javascriptTest.tex
similarity index 63%
rename from testXourses/javascriptTest.tex
rename to testXourses/dtxTestXourses/javascriptTest.tex
index 0cc4529..045528b 100644
--- a/testXourses/javascriptTest.tex
+++ b/testXourses/dtxTestXourses/javascriptTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/javascript}
+\activity{../../testFiles/dtxTestFiles/javascript/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/jaxTest.tex b/testXourses/dtxTestXourses/jaxTest.tex
similarity index 64%
rename from hardCoded/jaxTest.tex
rename to testXourses/dtxTestXourses/jaxTest.tex
index ff9d4c3..942b631 100644
--- a/hardCoded/jaxTest.tex
+++ b/testXourses/dtxTestXourses/jaxTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/labelsTest.tex b/testXourses/dtxTestXourses/labelsTest.tex
similarity index 65%
rename from hardCoded/labelsTest.tex
rename to testXourses/dtxTestXourses/labelsTest.tex
index c8bde37..370481a 100644
--- a/hardCoded/labelsTest.tex
+++ b/testXourses/dtxTestXourses/labelsTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/linkTest.tex b/testXourses/dtxTestXourses/linkTest.tex
similarity index 64%
rename from testXourses/linkTest.tex
rename to testXourses/dtxTestXourses/linkTest.tex
index 340b4d0..52df014 100644
--- a/testXourses/linkTest.tex
+++ b/testXourses/dtxTestXourses/linkTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{../link/link}
+\activity{../../testFiles/dtxTestFiles/link/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/localizationTest.tex b/testXourses/dtxTestXourses/localizationTest.tex
similarity index 64%
rename from testXourses/localizationTest.tex
rename to testXourses/dtxTestXourses/localizationTest.tex
index 52a95b2..85f0c65 100644
--- a/testXourses/localizationTest.tex
+++ b/testXourses/dtxTestXourses/localizationTest.tex
@@ -11,7 +11,7 @@
\maketitle
%\activity{testFiles/localization}
-\activity{../localization/basic}
+\activity{../../testFiles/dtxTestFiles/localization/basic}
%
@@ -22,15 +22,15 @@
\sectionstyle
\selectlanguage{french}
-\activity{../localization/french/basic}
+\activity{../../testFiles/dtxTestFiles/localization/french/basic}
\selectlanguage{dutch}
-\activity{../localization/dutch/basic}
+\activity{../../testFiles/dtxTestFiles/localization/dutch/basic}
\selectlanguage{brazil}
-\activity{../localization/brazil/basic}
+\activity{../../testFiles/dtxTestFiles/localization/brazil/basic}
\chapterstyle
\selectlanguage{english}
-\activity{../localization/multilingual}
+\activity{../../testFiles/dtxTestFiles/localization/multilingual}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/logosTest.tex b/testXourses/dtxTestXourses/logosTest.tex
similarity index 64%
rename from hardCoded/logosTest.tex
rename to testXourses/dtxTestXourses/logosTest.tex
index 00b1e7a..e21e47f 100644
--- a/hardCoded/logosTest.tex
+++ b/testXourses/dtxTestXourses/logosTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/macrosTest.tex b/testXourses/dtxTestXourses/macrosTest.tex
similarity index 65%
rename from hardCoded/macrosTest.tex
rename to testXourses/dtxTestXourses/macrosTest.tex
index 8eab158..1ca94dd 100644
--- a/hardCoded/macrosTest.tex
+++ b/testXourses/dtxTestXourses/macrosTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/makeCounterTest.tex b/testXourses/dtxTestXourses/makeCounterTest.tex
similarity index 66%
rename from hardCoded/makeCounterTest.tex
rename to testXourses/dtxTestXourses/makeCounterTest.tex
index 3dede16..4507402 100644
--- a/hardCoded/makeCounterTest.tex
+++ b/testXourses/dtxTestXourses/makeCounterTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/metadataTest.tex b/testXourses/dtxTestXourses/metadataTest.tex
similarity index 63%
rename from testXourses/metadataTest.tex
rename to testXourses/dtxTestXourses/metadataTest.tex
index 93d4f66..cb3f2c6 100644
--- a/testXourses/metadataTest.tex
+++ b/testXourses/dtxTestXourses/metadataTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/metadata}
+\activity{../../testFiles/dtxTestFiles/metadata/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/onlyTest.tex b/testXourses/dtxTestXourses/onlyTest.tex
similarity index 68%
rename from testXourses/onlyTest.tex
rename to testXourses/dtxTestXourses/onlyTest.tex
index 8d0dffe..6afc0fd 100644
--- a/testXourses/onlyTest.tex
+++ b/testXourses/dtxTestXourses/onlyTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/onlyBase}
+\activity{../../testFiles/dtxTestFiles/only/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/optionsTest.tex b/testXourses/dtxTestXourses/optionsTest.tex
similarity index 63%
rename from hardCoded/optionsTest.tex
rename to testXourses/dtxTestXourses/optionsTest.tex
index c721ec4..7547543 100644
--- a/hardCoded/optionsTest.tex
+++ b/testXourses/dtxTestXourses/optionsTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/placeHolder}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/optionsxourseTest.tex b/testXourses/dtxTestXourses/optionsxourseTest.tex
similarity index 63%
rename from hardCoded/optionsxourseTest.tex
rename to testXourses/dtxTestXourses/optionsxourseTest.tex
index 958af6c..95cb7e8 100644
--- a/hardCoded/optionsxourseTest.tex
+++ b/testXourses/dtxTestXourses/optionsxourseTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/placeHolder}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/outcomesTest.tex b/testXourses/dtxTestXourses/outcomesTest.tex
similarity index 53%
rename from testXourses/outcomesTest.tex
rename to testXourses/dtxTestXourses/outcomesTest.tex
index c64c6bb..e9f62d8 100644
--- a/testXourses/outcomesTest.tex
+++ b/testXourses/dtxTestXourses/outcomesTest.tex
@@ -8,9 +8,8 @@
\end{abstract}
\maketitle
-\activity{../outcomes/basic}
-\activity{../outcomes/outcome}
-\activity{../outcomes/outcome2}
+\activity{../../testFiles/dtxTestFiles/outcomes/base}
+\activity{../../testFiles/dtxTestFiles/outcomes/styling}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/packagesTest.tex b/testXourses/dtxTestXourses/packagesTest.tex
similarity index 65%
rename from hardCoded/packagesTest.tex
rename to testXourses/dtxTestXourses/packagesTest.tex
index 5fcd2f2..2b22535 100644
--- a/hardCoded/packagesTest.tex
+++ b/testXourses/dtxTestXourses/packagesTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/pagesetupTest.tex b/testXourses/dtxTestXourses/pagesetupTest.tex
similarity index 65%
rename from hardCoded/pagesetupTest.tex
rename to testXourses/dtxTestXourses/pagesetupTest.tex
index 3788a2d..a3d044f 100644
--- a/hardCoded/pagesetupTest.tex
+++ b/testXourses/dtxTestXourses/pagesetupTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/preambleTest.tex b/testXourses/dtxTestXourses/preambleTest.tex
similarity index 65%
rename from hardCoded/preambleTest.tex
rename to testXourses/dtxTestXourses/preambleTest.tex
index 6eaa976..9e9c3ca 100644
--- a/hardCoded/preambleTest.tex
+++ b/testXourses/dtxTestXourses/preambleTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/problemTest.tex b/testXourses/dtxTestXourses/problemTest.tex
similarity index 55%
rename from testXourses/problemTest.tex
rename to testXourses/dtxTestXourses/problemTest.tex
index 568b1cc..8e2ed6f 100644
--- a/testXourses/problemTest.tex
+++ b/testXourses/dtxTestXourses/problemTest.tex
@@ -7,9 +7,9 @@
\begin{document}
\maketitle
-\activity{testFiles/problemBase}
-\activity{testFiles/problemNesting}
-\activity{testFiles/problemNumbering}
+\activity{../../testFiles/dtxTestFiles/problem/base}
+\activity{../../testFiles/dtxTestFiles/problem/nesting}
+\activity{../../testFiles/dtxTestFiles/problem/numbering}
\end{document}
\ No newline at end of file
diff --git a/testXourses/proofTest.tex b/testXourses/dtxTestXourses/proofTest.tex
similarity index 64%
rename from testXourses/proofTest.tex
rename to testXourses/dtxTestXourses/proofTest.tex
index 022e4fa..61229a8 100644
--- a/testXourses/proofTest.tex
+++ b/testXourses/dtxTestXourses/proofTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/proofBase}
+\activity{../../testFiles/dtxTestFiles/proof/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/sagemathTest.tex b/testXourses/dtxTestXourses/sagemathTest.tex
similarity index 63%
rename from testXourses/sagemathTest.tex
rename to testXourses/dtxTestXourses/sagemathTest.tex
index 0551f58..d59f569 100644
--- a/testXourses/sagemathTest.tex
+++ b/testXourses/dtxTestXourses/sagemathTest.tex
@@ -5,7 +5,7 @@
\begin{document}
\maketitle
-\activity{testFiles/sagemathBase}
+\activity{../../testFiles/dtxTestFiles/sagemath/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/sectioningTest.tex b/testXourses/dtxTestXourses/sectioningTest.tex
similarity index 65%
rename from hardCoded/sectioningTest.tex
rename to testXourses/dtxTestXourses/sectioningTest.tex
index 669415b..c82ae3c 100644
--- a/hardCoded/sectioningTest.tex
+++ b/testXourses/dtxTestXourses/sectioningTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/solutionTest.tex b/testXourses/dtxTestXourses/solutionTest.tex
similarity index 63%
rename from testXourses/solutionTest.tex
rename to testXourses/dtxTestXourses/solutionTest.tex
index c8208cd..ae36500 100644
--- a/testXourses/solutionTest.tex
+++ b/testXourses/dtxTestXourses/solutionTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/solutionBase}
+\activity{../../testFiles/dtxTestFiles/solution/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/suppressTest.tex b/testXourses/dtxTestXourses/suppressTest.tex
similarity index 65%
rename from hardCoded/suppressTest.tex
rename to testXourses/dtxTestXourses/suppressTest.tex
index b0e7427..ed5f949 100644
--- a/hardCoded/suppressTest.tex
+++ b/testXourses/dtxTestXourses/suppressTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/dtxTestXourses/textcolorTest.tex b/testXourses/dtxTestXourses/textcolorTest.tex
new file mode 100644
index 0000000..53e5954
--- /dev/null
+++ b/testXourses/dtxTestXourses/textcolorTest.tex
@@ -0,0 +1,14 @@
+\documentclass{xourse}
+
+\input{../../testFiles/dtxTestFiles/textcolor/textcolorpreamble.tex}
+\title{Tests: Text Color}
+
+
+\begin{document}
+\maketitle
+
+\activity{../../testFiles/dtxTestFiles/textcolor/base}
+\activity{../../testFiles/dtxTestFiles/textcolor/customColors}
+
+
+\end{document}
\ No newline at end of file
diff --git a/testXourses/theoremsTest.tex b/testXourses/dtxTestXourses/theoremsTest.tex
similarity index 63%
rename from testXourses/theoremsTest.tex
rename to testXourses/dtxTestXourses/theoremsTest.tex
index 041b4a2..c7e683c 100644
--- a/testXourses/theoremsTest.tex
+++ b/testXourses/dtxTestXourses/theoremsTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/theoremsBasic}
+\activity{../../testFiles/dtxTestFiles/theorems/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/titleTest.tex b/testXourses/dtxTestXourses/titleTest.tex
similarity index 64%
rename from testXourses/titleTest.tex
rename to testXourses/dtxTestXourses/titleTest.tex
index f2eedb2..94f1c7f 100644
--- a/testXourses/titleTest.tex
+++ b/testXourses/dtxTestXourses/titleTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/titleBase}
+\activity{../../testFiles/dtxTestFiles/title/base}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/utilityMacrosTest.tex b/testXourses/dtxTestXourses/utilityMacrosTest.tex
similarity index 66%
rename from hardCoded/utilityMacrosTest.tex
rename to testXourses/dtxTestXourses/utilityMacrosTest.tex
index 6090755..05b337d 100644
--- a/hardCoded/utilityMacrosTest.tex
+++ b/testXourses/dtxTestXourses/utilityMacrosTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/validatorTest.tex b/testXourses/dtxTestXourses/validatorTest.tex
similarity index 51%
rename from testXourses/validatorTest.tex
rename to testXourses/dtxTestXourses/validatorTest.tex
index 407f4e9..c030c35 100644
--- a/testXourses/validatorTest.tex
+++ b/testXourses/dtxTestXourses/validatorTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/validator}
-\activity{testFiles/validator2}
+\activity{../../testFiles/dtxTestFiles/validator/base}
+\activity{../../testFiles/dtxTestFiles/validator/base2}
\end{document}
\ No newline at end of file
diff --git a/hardCoded/verbatimTest.tex b/testXourses/dtxTestXourses/verbatimTest.tex
similarity index 65%
rename from hardCoded/verbatimTest.tex
rename to testXourses/dtxTestXourses/verbatimTest.tex
index f498a70..7cc2cdb 100644
--- a/hardCoded/verbatimTest.tex
+++ b/testXourses/dtxTestXourses/verbatimTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/hardCodedContent}
+\activity{../../testFiles/dtxTestFiles/hardCodedContent}
\end{document}
\ No newline at end of file
diff --git a/testXourses/videoTest.tex b/testXourses/dtxTestXourses/videoTest.tex
similarity index 66%
rename from testXourses/videoTest.tex
rename to testXourses/dtxTestXourses/videoTest.tex
index 6a414e5..e9337be 100644
--- a/testXourses/videoTest.tex
+++ b/testXourses/dtxTestXourses/videoTest.tex
@@ -6,7 +6,7 @@
\begin{document}
\maketitle
-\activity{testFiles/videoBase}
+\activity{../../testFiles/dtxTestFiles/video/base}
\end{document}
\ No newline at end of file
diff --git a/testXourses/foldableTest.tex b/testXourses/foldableTest.tex
deleted file mode 100644
index 07fe7e0..0000000
--- a/testXourses/foldableTest.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: Expandable and Foldable}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/expandable}
-\activity{testFiles/foldableEnvironments}
-\activity{testFiles/foldableEnvironmentsOSU}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/hintsTest.tex b/testXourses/hintsTest.tex
deleted file mode 100644
index 1f0ce84..0000000
--- a/testXourses/hintsTest.tex
+++ /dev/null
@@ -1,13 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: Hints}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/hintsBase}
-\activity{testFiles/hintsBaseOSU}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/imageTest.tex b/testXourses/imageTest.tex
deleted file mode 100644
index 9daf03d..0000000
--- a/testXourses/imageTest.tex
+++ /dev/null
@@ -1,12 +0,0 @@
-\documentclass{xourse}
-
-\title{Tests: Image}
-\input{./testFiles/imagePreamble}
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/imageBase}
-
-
-\end{document}
\ No newline at end of file
diff --git a/testXourses/testFiles/imagePreamble.tex b/testXourses/testFiles/imagePreamble.tex
deleted file mode 100644
index 854f518..0000000
--- a/testXourses/testFiles/imagePreamble.tex
+++ /dev/null
@@ -1,7 +0,0 @@
-%\usepackage{svg}
-\graphicspath{
-{./}
-{./missionPatch/}
-{./testFiles/missionPatch/}
-{../missionPatch/}
-}
\ No newline at end of file
diff --git a/testXourses/testFiles/missionPatch/missionPatch-.svg b/testXourses/testFiles/missionPatch/missionPatch-.svg
deleted file mode 100644
index 9fbec41..0000000
--- a/testXourses/testFiles/missionPatch/missionPatch-.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
diff --git a/testXourses/testFiles/missionPatch/missionPatch.pdf b/testXourses/testFiles/missionPatch/missionPatch.pdf
deleted file mode 100644
index 2988b32..0000000
Binary files a/testXourses/testFiles/missionPatch/missionPatch.pdf and /dev/null differ
diff --git a/testXourses/testFiles/missionPatch/missionPatch.png b/testXourses/testFiles/missionPatch/missionPatch.png
deleted file mode 100644
index 76c4d60..0000000
Binary files a/testXourses/testFiles/missionPatch/missionPatch.png and /dev/null differ
diff --git a/testXourses/testFiles/missionPatch/missionPatch.svg b/testXourses/testFiles/missionPatch/missionPatch.svg
deleted file mode 100644
index 656cae3..0000000
--- a/testXourses/testFiles/missionPatch/missionPatch.svg
+++ /dev/null
@@ -1,21144 +0,0 @@
-
\ No newline at end of file
diff --git a/testXourses/testFiles/placeHolder.tex b/testXourses/testFiles/placeHolder.tex
deleted file mode 100644
index 2001d48..0000000
--- a/testXourses/testFiles/placeHolder.tex
+++ /dev/null
@@ -1,71 +0,0 @@
-\documentclass{ximera}
-\title{Template}
-
-%\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
-\begin{document}
-\begin{abstract}
- A testbed file Template.
-\end{abstract}
-\maketitle
-
-{{\Huge \bfseries Last Updated: \today}} \\
-
-If you have come to this page, then the test activity you were looking into either hasn't had a testbed activity implemented for it yet,
-or it doesn't (as of the last update of this repo) have any commands, environments, or any other aspects that require testing.
-
-\section{Basic Usage}
-
-This is a template file. The Basic Usage section should be used to describe the \textbf{basic} usage
-of the commands/environments/etc (refered to hereafter as ``DemoCom'' for simplicity) being tested/demonstrated in the file.
-
-In particular, it should explain any requirements of where/how the DemoCom should/must be placed (e.g. \verb|\answer| must be in mathemode
-and the abstract must be after begin document, not the preamble). It should also explain the most basic usecase, and any
-relevant optional parameters being tested/demo'ed in the file.
-
-\section{Intended Outcome of Test}
-
-The intended outcome section should show what the output of the demo case looks like, without actually using the DemoCom itself.
-Any inconsistencies in formating/display should be noted as well as possible here as well, but it is important to not use the
-DemoCom itself so that we have an objective ``anticipated output'' to use as a comparison to what is \textit{actually} output in
-test.
-
-\section{Start of Test/Demo Area}
-
-This should contain the actual test/demonstration of DemoCom, which can then be compared to the description above to look for
-unexpected behavior.
-
-\hrulefill
-
-
-\end{document}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% For copy/paste into new files: %%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\documentclass{ximera}
-\title{Template}
-
-%\input{preamble.tex}% Only add a preamble file if it is actually necessary for the demo/test.
-\begin{document}
-\begin{abstract}
-
-\end{abstract}
-\maketitle
-
-{{\Huge \bfseries Last Updated: \today}} \\
-
-
-\section{Basic Usage}
-
-
-\section{Intended Outcome of Test}
-
-
-\section{Start of Test/Demo Area}
-
-
-\hrulefill
-
-
-\end{document}
diff --git a/testXourses/testFiles/preamble.tex b/testXourses/testFiles/preamble.tex
deleted file mode 100644
index e69de29..0000000
diff --git a/testXourses/textcolorTest.tex b/testXourses/textcolorTest.tex
deleted file mode 100644
index 253231e..0000000
--- a/testXourses/textcolorTest.tex
+++ /dev/null
@@ -1,14 +0,0 @@
-\documentclass{xourse}
-
-\input{testFiles/textcolorpreamble.tex}
-\title{Tests: Text Color}
-
-
-\begin{document}
-\maketitle
-
-\activity{testFiles/textcolorBase}
-\activity{testFiles/textcolorCustomColors}
-
-
-\end{document}
\ No newline at end of file