diff --git a/mcmc/fields/fermion/diracOperator/diracOperator.nim b/mcmc/fields/fermion/diracOperator/diracOperator.nim
deleted file mode 100644
index 9e31924..0000000
--- a/mcmc/fields/fermion/diracOperator/diracOperator.nim
+++ /dev/null
@@ -1,67 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/diracOperator.nim
-
-Description: 
-  Defines data type and constructor for generic Dirac operator
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import ./smearing/linkSmearing
-import ../../latticeFields
-
-export linkSmearing
-
-#[
-  Idea: instantiates link smearing based on actual gauge
-  field object (not the fields)
-]#
-
-import diracOperatorDefinitions
-import json
-
-type
-  DiracOperator*[N:static[int]] {.inheritable.} = ref object
-    smearing: LinkSmearing[N]
-    case boundaryConditionPolicy: BoundaryConditionPolicy
-      of StandardBoundaryConditions:
-        periodicity: seq[string]
-
-proc newDiracOperator*[N:static[int]](
-    self: DiracOperator[N]; 
-    u: seq[DComplexMatrixV[N]]; 
-    info: JsonNode
-  ) =
-  self.smearing = u.newLinkSmearing(info)
-  
-
-
diff --git a/mcmc/fields/fermion/diracOperator/diracOperatorDefinitions.nim b/mcmc/fields/fermion/diracOperator/diracOperatorDefinitions.nim
deleted file mode 100644
index f66b7aa..0000000
--- a/mcmc/fields/fermion/diracOperator/diracOperatorDefinitions.nim
+++ /dev/null
@@ -1,55 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/diracOperator/diracOperatorDefinitions.nim
-
-Description: 
-  Defines various data types and strings for generic Dirac operator
-  operations under mcmc/fields/fermion/diracOperator
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import gauge
-import ../smearing/linkSmearing
-import ../../latticeFields
-import ../../gauge/unitary/unitaryGauge
-import ../../../mcmc/mcmcErrorHandling
-
-export qex
-export gauge
-export linkSmearing
-export latticeFields
-export unitaryGauge
-export mcmcErrorHandling
-
-type
-  BoundaryConditionPolicy* = enum
-    StandardBoundaryConditions
\ No newline at end of file
diff --git a/mcmc/fields/fermion/smearing/linkSmearing.nim b/mcmc/fields/fermion/smearing/linkSmearing.nim
deleted file mode 100644
index 6c8a227..0000000
--- a/mcmc/fields/fermion/smearing/linkSmearing.nim
+++ /dev/null
@@ -1,214 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/linkSmearing/linkSmearing.nim
-
-Description: 
-  Defines link smearing data type, constructor, and methods. 
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import smearingDefinitions
-import nhypSmearing
-import stoutSmearing
-import json
-
-type
-  LinkSmearing*[N:static[int]] = ref object
-    ## LinkSmearing object
-    ## Attributes:
-    ##   nsmear: Number of smearings; applies to only stout for now
-    ##   su: Smeared gauge field (../../latticeFields.nim)
-    ##   u: Reference to unsmeared gauge field (../../latticeFields.nim)
-    ##   derivative: Procedure implementing chain rule
-    ##      Inputs: 
-    ##        f: Output of function of links
-    ##        chain: df/dV for V the smeared link 
-    ##    smearingPolicy: SmearingPolicy specifying which
-    ##      smearing is to be implemented
-    ##    nhyp: Tuple containing HypCoefs nHYP container
-    ##      and container of nHYP runtime information
-    ##      (src/gauge/hypsmear.nim)
-    ##    stout: Sequence of "Stout" objects
-    nsmear: int
-    su*: seq[DComplexMatrixV[N]]
-    u*: ref seq[DComplexMatrixV[N]]
-    derivative*: proc(f,chain:seq[DComplexMatrixV[N]])
-    case smearingPolicy: SmearingPolicy
-      of HypercubicSmearing:
-        nhyp: tuple[parameters:HypCoefs,info:PerfInfo]
-      of StoutSmearing:
-        stout: seq[Stout[N]]
-      of NoSmearing: discard
-
-proc newLinkSmearing*[N:static[int]](
-    u: seq[DComplexMatrixV[N]]; 
-    info: JsonNode
-  ): LinkSmearing[N] =
-  ## LinkSmearing object constructor
-  ## Inputs:
-  ##   u: Gauge field data type (../../latticeFields.nim)
-  ##   info: JSON data type containing gauge field info
-  ## Output:
-  ##   result: Link smearing object 
-  
-  # Set policy variable and pick smearing from available options
-  var policy: SmearingPolicy
-  if not info.hasKey("smearing"): qexError SmearingError1
-  case info["smearing"].getStr():
-    of "nhyp","nHYP","hypercubic","Hypercubic": policy = HypercubicSmearing
-    of "stout","Stout": policy = StoutSmearing
-    of "none","NONE","na","NA","n/a","N/A": policy = NoSmearing
-    else:
-      echo SmearingError2
-      throwError info["smearing"].getStr() & " is not a valid smearing option"
-
-  # Construct link smearing object
-  result = LinkSmearing[N](smearingPolicy: policy)
-  
-  # Create reference to unsmeared gauge field & construct smeared
-  # gauge field
-  new(result.u)
-  result.u[] = u
-  result.su = u[0].l.newComplexGaugeLinks(N)
-
-  # Construct smearing according to chosen smearing policy
-  result.nsmear = case result.smearingPolicy
-    of HypercubicSmearing: 1
-    of StoutSmearing: 
-      (if info.hasKey("smearing-levels"): info["smearing-levels"].getInt() else: 1)
-    of NoSmearing: 0
-  case result.smearingPolicy:
-    of HypercubicSmearing:
-      var alph: seq[float]
-      case info.hasKey("smearing-coefficients"):
-        of true:
-          alph = newSeq[float]()
-          for alphav in info["smearing-coefficients"].getElems(): 
-            alph.add alphav.getFloat()
-        of false: alph = @[0.4,0.5,0.5] # Default if not provided
-      result.nhyp.parameters = HypCoefs(alpha1:alph[0],alpha2:alph[1],alpha3:alph[2])
-      qexLog result.smearingPolicy.instantiationLogMessage(alph,result.nsmear)
-    of StoutSmearing:
-      let rho = case info.hasKey("smearing-coefficient")
-        of true: info["smearing-coefficient"].getFloat()
-        of false: 0.1 # Default if not proided
-      var rhos: seq[float]
-      result.stout = newSeq[Stout[N]]()
-      case info.hasKey("smearing-coefficients"):
-        of true:
-          for elem in info["smearing-coefficients"].getElems():
-            rhos.add elem.getFloat()
-        of false: # Default to same rho for all smears
-          for smear in 0..<result.nsmear: rhos.add rho
-      if not (rhos.len == result.nsmear):
-        throwError "\"# stout\" != \"# rho values provided\""
-      for smear in 0..<result.nsmear: result.stout.add u.newStout(rhos[smear])
-      qexLog result.smearingPolicy.instantiationLogMessage(rhos,result.nsmear)
-    of NoSmearing: qexLog result.smearingPolicy.instantiationLogMessage(@[],0)
-
-proc smear*(self: LinkSmearing) =
-  ## Smears gauge links
-  ## Inputs:
-  ##   self: LinkSmearing object
-  case self.smearingPolicy:
-    of HypercubicSmearing: self.nhyp.smear(self.u[],self.su)
-    of StoutSmearing: self.stout.smear(self.u[],self.su)
-    of NoSmearing: self.su := self.u[]
-
-proc smearGetDerivative*(self: LinkSmearing) =
-  ## Smears gauge links & returns proc for derivative of function of smeared links
-  ## Inputs:
-  ##   self: LinkSmearing object
-  self.derivative = case self.smearingPolicy
-    of HypercubicSmearing: self.nhyp.smearGetDerivative(self.u[],self.su)
-    of StoutSmearing: self.stout.smearGetDerivative(self.u[],self.su)
-    of NoSmearing: identity
-
-if isMainModule:
-  qexInit()
-
-  # Create lattice
-  var
-    lat = @[8,8,8,8]
-    lo = newLayout(lat)
-    testGC = GaugeActionCoeffs(plaq: 1.0)
-
-  # Create smearing objects
-  var 
-    u = lo.newComplexGaugeLinks(3)
-    f = lo.newComplexGaugeLinks(3)
-    nhypInfo = %* {
-      "smearing": "nhyp",
-      "smearing-coefficients": [0.4,0.5,0.5]
-    }
-    stoutInfo = %* {
-      "smearing": "stout",
-      "smearing-levels": 3,
-      "smearing-coefficient": 0.1, # Won't be used because vvvv
-      "smearing-coefficients": [0.1,0.2,0.3] # Set custom values for "rho"
-    }
-    noneInfo = %* {"smearing": "none"}
-    nhyp = u.newLinkSmearing(nhypInfo)
-    stout = u.newLinkSmearing(stoutInfo)
-    none = u.newLinkSmearing(noneInfo)
-
-  # Set gauge to random; should update reference in smearing objects
-  u.random
-
-  # Test out smearing
-  nhyp.smear()
-  stout.smear()
-  none.smear()
-
-  # Print out actions w/ unsmeared/smeared links
-  echo "nHYP: ", testGC.gaugeAction1(nhyp.u[]), "/", testGC.gaugeAction1(nhyp.su)
-  echo "stout: ", testGC.gaugeAction1(stout.u[]), "/", testGC.gaugeAction1(stout.su)
-  echo "none: ", testGC.gaugeAction1(none.u[]), "/", testGC.gaugeAction1(none.su)
-
-  # Test out smear with objective of getting force
-  nhyp.smearGetDerivative()
-  stout.smearGetDerivative()
-  none.smearGetDerivative()
-
-  # Smear force
-  proc testForceSmear(self: LinkSmearing) =
-    var f2u,f2s: float
-    testGC.gaugeActionDeriv(self.u[],f)
-    f2u = f.norm2
-    testGC.gaugeActionDeriv(self.su,f)
-    f2s = f.norm2
-    self.derivative(f,f)
-    echo $(self.smearingPolicy) & " smeared force f^2: ", f.norm2, "/", f2s, "/", f2u
-  nhyp.testForceSmear()
-  stout.testForceSmear()
-  none.testForceSmear()
-
-  qexFinalize()
\ No newline at end of file
diff --git a/mcmc/fields/fermion/smearing/nhypSmearing.nim b/mcmc/fields/fermion/smearing/nhypSmearing.nim
deleted file mode 100644
index ec5cb12..0000000
--- a/mcmc/fields/fermion/smearing/nhypSmearing.nim
+++ /dev/null
@@ -1,87 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/linkSmearing/nhypSmearing.nim
-
-Description: 
-  Wrapper procedures for nHYP smearing (src/gauge/hypsmear). See the
-  following for more details:
-    - src/gauge/hypsmear.nim
-    - "Hypercubic smeared links for dynamical fermions"
-      - Hasenfratz, A., Hoffmann, R., Schaefer, S., JHEP05(2007)029
-      - DOI: 10.1088/1126-6708/2007/05/029
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import gauge/hypsmear
-
-proc smear*[S](nhyp: var tuple[parameters:HypCoefs,info:PerfInfo]; u,v: seq[S]) =
-  ## Smearing u links & store result in v links
-  ## Inputs:
-  ##   nhyp: Tuple of information for nHYP smearing (src/gauge/hypsmear.nim)
-  ##   u: Input gauge field (unaffected)
-  ##   v: Smeared u links
-  ## Comments:
-  ##   - Wraps smearing proc in src/gauge/hypsmear.nim
-  nhyp.parameters.smear(u,v,nhyp.info)
-  qexLog "Smeared links with HypercubicSmearing"
-
-proc smearGetDerivative*[S](
-    nhyp: var tuple[parameters:HypCoefs,info:PerfInfo]; 
-    u,v: seq[S]
-  ): auto =
-  ## Smear u links, store result in v links, return smeared force proc
-  ## Inputs:
-  ##  nhyp: Tuple of information for nHYP smearing (src/gauge/hypsmear.nim)
-  ##   u: Input gauge field (unaffected)
-  ##   v: Smeared u links
-  ## Output:
-  ##   result: Proc taking in force and returning its smeared counterpart
-  ## Comments:
-  ##   - Wraps "smearGetForce" in src/gauge/hypsmear.nim
-  let smearForce = nhyp.parameters.smearGetForce(u,v,nhyp.info)
-  proc smearedForce(f,chain:seq[S]) =
-    ## Smears force with nHYP smearing
-    ## Inputs:
-    ##   f: Smeared force
-    ##   chain: Field derivative being calculate with respect to
-    ## Comments:
-    ##   - fₓₚₜ ← chainₘₖₕ d/dUₓₚₜ^*[Vₘₖₕ(U)^*] + chainₘₕₖ^* d/dUₓₚₜ^*[Vₘₕₖ(U)]
-    ##   - If using to calculate dS/dU for some nHYP-smeared
-    ##     action "S", make sure "chain" is output of 
-    ##     already-calculated force with respect to the 
-    ##     outermost smeared link
-    ##   - Output is not rephased and not projected to its
-    ##     traceless/anti-Hermitian part; this must be done after
-    f.smearForce(chain)
-    qexLog "Smeared force with HypercubicSmearing"
-  qexLog "Smeared links with HypercubicSmearing"
-  result = smearedForce
diff --git a/mcmc/fields/fermion/smearing/smearingDefinitions.nim b/mcmc/fields/fermion/smearing/smearingDefinitions.nim
deleted file mode 100644
index 4c9547c..0000000
--- a/mcmc/fields/fermion/smearing/smearingDefinitions.nim
+++ /dev/null
@@ -1,153 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/linkSmearing/smearingDefinitions.nim
-
-Description: 
-  Defines various data types and strings for generic smearing
-  operations under mcmc/fields/fermion/smearing
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import gauge
-import gauge/[hypsmear,stoutsmear]
-import ../../latticeFields
-import ../../gauge/unitary/unitaryGauge
-import ../../../mcmc/mcmcErrorHandling
-
-export qex
-export gauge
-export hypsmear
-export stoutsmear
-export latticeFields
-export unitaryGauge
-export mcmcErrorHandling
-
-type
-  SmearingPolicy* = enum
-    HypercubicSmearing,
-    StoutSmearing,
-    NoSmearing
-
-const
-  SmearingError1* = """
-  |------------------------- QEX error -------------------------|
-    Smearing option not chosen. Specify in JSON input for
-    gauge smearing as "smearing": "<option>" with...
-
-    <option> = 
-    stout,
-    Stout,
-    nhyp
-    nHYP,
-    hypercubic,
-    Hypercubic
-
-                            - stout - 
-    If "stout" or "Stout" is specified, then you must provide 
-    "rho" coefficient as "smearing-coefficient" = <rho>; 
-    otherwise, rho will default 0.1. You can also optionally 
-    specify "smearing-levels" = <# smears> for multiple stout 
-    smears. If you alteratively provide 
-    "smearing-coefficients" = [<rho_1>,<rho_2>,...] with
-    [<rho_1>,<rho_2>,...] an array of size <# smears>, each
-    stout smear will have its own value for rho.
-
-                            - nhyp - 
-    If "nhyp", "nHYP", "hypercubic",or "Hypercubic" is 
-    specified, you must provide alpha_1, alpha_2, and alpha_3 
-    parameters as 
-    "smearing-coefficients": [<alpha_1>,<alpha_2>,<alpha_3>];
-    otherwise, they will default to alpha_1 = 0.4, 
-    alpha_2 = 0.5, and alpha_3 = 0.5. Note that multiple levels
-    of stout smearing is not currently supported, but could be
-    if it is requested.
-  |------------------------- QEX error -------------------------|
-  """
-  SmearingError2* = """
-  |------------------------- QEX error -------------------------|
-    Chosen smearing option is either invalid or unavailable.
-    Please choose from the following:
-    
-    stout,
-    Stout,
-    nhyp
-    nHYP,
-    hypercubic,
-    Hypercubic
-
-                            - stout - 
-    If "stout" or "Stout" is specified, then you must provide 
-    "rho" coefficient as "smearing-coefficient" = <rho>; 
-    otherwise, rho will default 0.1. You can also optionally 
-    specify "smearing-levels" = <# smears> for multiple stout 
-    smears. If you alteratively provide 
-    "smearing-coefficients" = [<rho_1>,<rho_2>,...] with
-    [<rho_1>,<rho_2>,...] an array of size <# smears>, each
-    stout smear will have its own value for rho.
-
-                            - nhyp - 
-    If "nhyp", "nHYP", "hypercubic",or "Hypercubic" is 
-    specified, you must provide alpha_1, alpha_2, and alpha_3 
-    parameters as 
-    "smearing-coefficients": [<alpha_1>,<alpha_2>,<alpha_3>];
-    otherwise, they will default to alpha_1 = 0.4, 
-    alpha_2 = 0.5, and alpha_3 = 0.5. Note that multiple levels
-    of stout smearing is not currently supported, but could be
-    if it is requested.
-  |------------------------- QEX error -------------------------|
-  """
-
-proc convSeqToStr(sq: seq[float]): string = 
-  result = "["
-  for idx,sqv in sq: 
-    if idx == 0: result = result & $(sqv)
-    else: result = result & ", " & $(sqv)
-  result = result & "]"
-
-template instantiationLogMessage*(
-    policy: SmearingPolicy;
-    coeffs: seq[float];
-    nsmears: int
-  ): untyped =
-  var 
-    str = case policy 
-      of HypercubicSmearing,StoutSmearing: 
-        "Instantiated " & $(policy) & " with parameters = " & coeffs.convSeqToStr
-      of NoSmearing: "Instantiated " & $(policy)
-  str
-
-proc identity*[S](f,chain:seq[S]) =
-  discard
-
-if isMainModule:
-  echo SmearingError1
-  echo SmearingError2
\ No newline at end of file
diff --git a/mcmc/fields/fermion/smearing/stoutSmearing.nim b/mcmc/fields/fermion/smearing/stoutSmearing.nim
deleted file mode 100644
index e352c89..0000000
--- a/mcmc/fields/fermion/smearing/stoutSmearing.nim
+++ /dev/null
@@ -1,182 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/linkSmearing/stoutSmearing.nim
-
-Description: 
-  Procedures for stout smearing based on src/gauge/stoutsmear.nim. See
-  the following for more details:
-    - src/gauge/stoutsmear.nim
-    - "Analytic smearing of SU⁡(3) link variables in lattice QCD"
-      - Morningstar, C., Peardon, M., Phys. Rev. D 69, 054501
-      - DOI: https://doi.org/10.1103/PhysRevD.69.054501
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import smearingDefinitions
-
-type Stout*[N:static[int]] = ref object
-  ## Stout smearing object
-  ## Attributes:
-  ##   wilsonAction: Wilson action coefficients for smearing;
-  ##     see comment below
-  ##   rho: Stout smearing "rho" parameter (su = exp(rho*Q)*u)
-  ##   su: Smeared gauge link
-  ## Comments:
-  ##   - Stout smear is done with respect to Wilson "flow" 
-  ##     action; see Eqn. 4.43 of doi:10.1007/978-94-024-0999-4
-  wilsonAction: GaugeActionCoeffs
-  rho: float
-  su,sf,expasf: seq[DComplexMatrixV[N]]
-
-proc newStout*[N](u: seq[DComplexMatrixV[N]]; rho: float): auto =
-  ## Stout object constructor
-  ## Inputs:
-  ##   u: Gauge field (../../latticeFields.nim)
-  ##   rho: Stout smear "rho" parameter (su = exp(rho*Q)*u)
-  result = Stout[N](rho: rho, wilsonAction: GaugeActionCoeffs(plaq: 1.0))
-  result.su = u[0].l.newComplexGaugeLinks(N)
-  result.sf = u[0].l.newComplexGaugeLinks(N)
-  result.expasf = u[0].l.newComplexGaugeLinks(N)
-
-proc smear(self: Stout; u,q: auto; derivative: bool = false) =
-  ## Smear gauge link "u" with one level of stout smearing
-  ## Inputs:
-  ##   Stout: Stout object
-  ##   u: Gauge field to be smeared (../../latticeFields.nim)
-  ##   q: Lie algebra element entering smearing as su = exp(rho*q)*u
-  ## Comments:
-  ##   - Based on src/gauge/stoutsmear.nim
-  let alpha = -self.rho*u[0][0].nrows.float # "rho" rescaled by Nc
-  var # su,sf,expasf are references to Stout field attributes
-    su = self.su 
-    sf = self.sf
-    expasf = self.expasf
-  self.wilsonAction.gaugeActionDeriv(u,q)
-  threads:
-    for mu in 0..<q.len:
-      for s in q[mu]:
-        let staple = u[mu][s]*q[mu][s].adj
-        var temp {.noinit.}: evalType(q[mu][s])
-        temp.projectTAH staple
-        if derivative: sf[mu][s] := temp
-        temp := exp(alpha*temp)
-        if derivative: expasf[mu][s] := temp
-        su[mu][s] := temp*u[mu][s]
-
-proc derivative(self: Stout; derivative,chain,q,tu: auto) =
-  ## Calculates derivative of one stout-smeared field w.r.t. another field
-  ## Inputs:
-  ##   self: Stout object
-  ##   derivative: Field holding derivative
-  ##   chain: Field derivative being calculated with respect to
-  ##   q,tu: Convenience fields used for calculation
-  ## Comments:
-  ##   - Based on src/gauge/stoutsmear.nim
-  ##   - derivative & chain must be distinct fields
-  ##   - Conventions:
-  ##     c† = c† exp(a sf)
-  ##     D[exp(a sf)]† = d/d(exp(a sf))[exp(a sf) u] c†
-  ##     D[exp(a sf)]† = u c†
-  ##     D[a sf]† = d/d(a sf)[exp(a sf)] D[exp(a sf)]†
-  ##     D[sf]† = d/d(f)[a sf] D[a sf]†
-  ##     D[u]† = d/d(u)[exp(a sf) u]
-  let alpha = -self.rho*derivative[0][0].nrows.float # "rho" rescaled by Nc
-  let # f,exp are references to Stout field attributes
-    su = self.su
-    sf = self.sf
-    expasf = self.expasf
-  threads:
-    for mu in 0..<q.len:
-      for s in q[mu]: 
-        var temp {.noinit.}: type(q[mu][s])
-        temp := chain[mu][s]*su[mu][s].adj
-        derivative[mu][s] := alpha*expDeriv(alpha*sf[mu][s],temp)
-  gaugeForceDeriv(self.su,derivative,derivative,q,tu)
-  threads:
-    for mu in 0..<q.len:
-      for s in q[mu]: derivative[mu][s] += expasf[mu][s].adj*chain[mu][s]
-
-proc smear*[N:static[int]](
-    stout: seq[Stout[N]]; 
-    u,su: auto; 
-    derivative: bool = false
-  ) =
-  ## Smear gauge link "u" with multiple levels of stout smearing
-  ## Inputs:
-  ##   stout: sequence of Stout objects
-  ##   u: Gauge field to be smeared (../../latticeFields.nim)
-  ##   su: Smeared gauge field
-  var q = u[0].l.newComplexGaugeLinks(N)
-  su := u
-  for smear in stout:
-    smear.smear(su,q,derivative=derivative)
-    su := smear.su
-  qexLog "Smeared links with StoutSmearing"
-
-proc smearGetDerivative*[N:static[int],S](
-    stout: seq[Stout[N]]; 
-    u,su: seq[S]
-  ): auto =
-  ## Smears gauge links and returns proc for smearing force
-  ## Inputs:
-  ##   stout: Sequence of Stout objects
-  ##   u: Unsmeared field
-  ##   su: Smeared field
-  stout.smear(u,su,derivative=true)
-  proc smearedForce(f,chain:seq[S]) =
-    ## Calculates stout-smeared force
-    ## Inputs:
-    ##   f: Smeared force
-    ##   chain: Field derivative being calculate with respect to
-    ## Comments:
-    ##   - See comments under "derivative" for details
-    ##   - If using to calculate dS/dU for some stout-smeared
-    ##     action "S", make sure "chain" is output of 
-    ##     already-calculated force with respect to the 
-    ##     outermost smeared link
-    ##   - Output is not rephased and not projected to its
-    ##     traceless/anti-Hermitian part; this must be done after
-    var
-      (q,tu,sfa,sfb) = (
-        f[0].l.newComplexGaugeLinks(N),
-        f[0].l.newComplexGaugeLinks(N),
-        f[0].l.newComplexGaugeLinks(N),
-        f[0].l.newComplexGaugeLinks(N)
-      )
-    for idx in countdown(stout.len,0):
-      let xdi = stout.len - idx
-      if xdi == 0: sfa := chain
-      elif xdi == stout.len: stout[idx].derivative(f,sfa,q,tu)
-      else: 
-        stout[idx].derivative(sfb,sfa,q,tu)
-        sfa := sfb
-    qexLog "Smeared force with StoutSmearing"
-  result = smearedForce
\ No newline at end of file
diff --git a/mcmc/fields/fermion/staggered/staggered.nim b/mcmc/fields/fermion/staggered/staggered.nim
deleted file mode 100644
index b3f431a..0000000
--- a/mcmc/fields/fermion/staggered/staggered.nim
+++ /dev/null
@@ -1,57 +0,0 @@
-"""
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/staggered/staggered.nim
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import qex
-import physics/[stagD,stagSolve]
-import ../operators/diracOperators
-import ../../latticeFields
-
-export latticeFields
-
-const
-  ActionCGTol = 1e-20
-  ForceCGTol = 1e-12
-  ActionMaxCGIter = 10000
-  ForceMaxCGIter = 10000
-
-type
-  StaggeredDiracOperator*[S] = ref object of DiracOperator[S]
-    rephased*: bool
-    shifter*: seq[Shifter[S,W]]
-
-proc zeroOdd*[T](phi: T) =
-  threads: phi.odd := 0
-
-proc zero*[T](phi: T) =
-  threads: phi := 0
-
-proc zero*[T](phis: seq[T]) =
-  threads: 
-    for phi in phis: phi := 0
\ No newline at end of file
diff --git a/mcmc/fields/fermion/staggered/staggeredFermion.nim b/mcmc/fields/fermion/staggered/staggeredFermion.nim
deleted file mode 100644
index 6aaedef..0000000
--- a/mcmc/fields/fermion/staggered/staggeredFermion.nim
+++ /dev/null
@@ -1,43 +0,0 @@
-"""
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/fermion/staggered/staggeredFermion.nim
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""
-
-import qex
-import staggered
-
-type
-  StaggeredFermion*[L:static[int]] = ref object of LatticeField[L]
-    # should probably have the ability to be multiple representations
-    # of multiple gauge fields, if desired. This would entail having
-    # multiple instances of StaggeredDiracOperator & being a tensor
-    # product of multiple representations.
-    # kind of like...
-    # operators: seq[StaggeredDiracOperator[S]]
-    # field: "tensor data type"
-    
\ No newline at end of file
diff --git a/mcmc/fields/gauge/gaugeDefinitions.nim b/mcmc/fields/gauge/gaugeDefinitions.nim
deleted file mode 100644
index 44b982d..0000000
--- a/mcmc/fields/gauge/gaugeDefinitions.nim
+++ /dev/null
@@ -1,175 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/gauge/gaugeDefinitions.nim
-
-Description: 
-  Defines basic objects/types for gauge fields.
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import gauge
-import ../latticeFields
-import ../../mcmc/mcmcErrorHandling
-
-export qex
-export gauge
-export latticeFields
-export mcmcErrorHandling
-
-const
-  BetaAOverBetaF* = -1.0/4.0
-  C1Symanzik* = -1.0/12.0
-  C1Iwasaki* = -0.331
-  C1DoublyBlockedWilson* = -1.4088
-
-type
-  GaugeActionPolicy* = enum 
-    Wilson, 
-    Adjoint, 
-    Rectangle, 
-    Symanzik, 
-    Iwasaki, 
-    DoublyBlockedWilson
-
-const
-  GaugeError1* = """
-  |------------------------- QEX error -------------------------|
-    Gauge action not specified for gauge field(s). Specify in 
-    JSON input for gauge field as "action": "<option>" with...
-  
-    <option> = 
-    wilson,
-    Wilson,
-    rectangle,
-    Rectangle,
-    adjoint,
-    Adjoint,
-    symanzik,
-    Symanzik,
-    luescher-weiss,
-    Luescher-Weiss,
-    luscher-weiss,
-    Luscher-Weiss,
-    iwasaki,
-    Iwasaki,
-    doubly-blocked-wilson,
-    doubly-blocked-Wilson,
-    Doubly-Blocked-Wilson,
-    dbw,
-    dbw2
-
-                          - rectangle -
-    If you specify "rectangle" or "Rectangle", you must provide 
-    the rectangle coefficient in JSON input as 
-    "rectangle-coefficient": <rectangle-coefficient>. Otherwise,
-    rectangle with default to "symanzik", "Symanzik", 
-    "luescher-weiss", "Luescher-Weiss", "luscher-weiss", 
-    "Luscher-Weiss" value of -1/12. 
-    
-                        - adjoint-plaquette -
-    If you specify "adjoint" or "Adjoint", you must provide 
-    beta_F/beta_A (beta_F = beta) as 
-    "adjoint-ratio": <adjoint-ratio>. Otherwise, beta_F/beta_A 
-    will default to -1/4. 
-  |------------------------- QEX error -------------------------|
-  """
-  GaugeError2* = """
-  |------------------------- QEX error -------------------------|
-    Bare gauge coupling (beta) not specified for gauge 
-    field(s). Specify in JSON input as "beta": <beta>.
-  |------------------------- QEX error -------------------------|
-  """
-  GaugeError3* = """
-  |------------------------- QEX error -------------------------|
-    Invalid choice for gauge action. Possible choices are:
-
-    wilson,
-    Wilson,
-    rectangle,
-    Rectangle,
-    adjoint,
-    Adjoint,
-    symanzik,
-    Symanzik,
-    luescher-weiss,
-    Luescher-Weiss,
-    luscher-weiss,
-    Luscher-Weiss,
-    iwasaki,
-    Iwasaki,
-    doubly-blocked-wilson,
-    doubly-blocked-Wilson,
-    Doubly-Blocked-Wilson,
-    dbw,
-    dbw2
-
-                          - rectangle -
-    If you specify "rectangle" or "Rectangle", you must provide 
-    the rectangle coefficient in JSON input as 
-    "rectangle-coefficient": <rectangle-coefficient>. Otherwise,
-    rectangle with default to "symanzik", "Symanzik", 
-    "luescher-weiss", "Luescher-Weiss", "luscher-weiss", 
-    "Luscher-Weiss" value of -1/12. 
-    
-                        - adjoint-plaquette -
-    If you specify "adjoint" or "Adjoint", you must provide 
-    beta_F/beta_A (beta_F = beta) as 
-    "adjoint-ratio": <adjoint-ratio>. Otherwise, beta_F/beta_A 
-    will default to -1/4. 
-  |------------------------- QEX error -------------------------|
-  """
-
-const
-  GaugeWarning1* = """
-  |------------------------ QEX warning ------------------------|
-    Rectangle coefficient not specified for gauge field(s). 
-    Defaulting to "Symanzik" (Luescher-Weiss) value of -1/12. 
-    If you wish to simulate with a different rectangle factor, 
-    specify "rectangle-coefficient": <rectangle-coefficient>
-    in JSON input.
-  |------------------------ QEX warning ------------------------|
-  """
-  GaugeWarning2* = """
-  |------------------------ QEX warning ------------------------|
-    Adjoint ratio beta_A/beta_F not specified for gauge 
-    field(s). Defaulting to "Adjoint" value of -1/4. If you 
-    wish to simulate with a different adjoint ratio, specify 
-    "adjoint-ratio": <adjoint-ratio> in JSON input.
-  |------------------------ QEX warning ------------------------|
-  """
-
-if isMainModule:
-  echo GaugeError1
-  echo GaugeError2
-  echo GaugeError3
-  echo GaugeWarning1
-  echo GaugeWarning2
\ No newline at end of file
diff --git a/mcmc/fields/gauge/unitary/unitaryGauge.nim b/mcmc/fields/gauge/unitary/unitaryGauge.nim
deleted file mode 100644
index df31a9b..0000000
--- a/mcmc/fields/gauge/unitary/unitaryGauge.nim
+++ /dev/null
@@ -1,213 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/gauge/unitary/unitary.nim
-
-Description: 
-  Defines unitary gauge field objects, constructors, and methods
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import ../gaugeDefinitions
-import json
-
-type
-  SpecialUnitaryGauge*[L,N:static[int]] = ref object of LatticeField[L]
-    ## SpecialUnitaryGauge object
-    ## Attributes:
-    ##   u: gauge field (mcmc/fields/latticeFields.nim)
-    ##   actionPolicy: named gauge action (mcmc/fields/gauge/gaugeDefinitions.nim)
-    ##   actionParams: gauge action coefficients (src/gauge/gaugeAction.nim)
-    u*: seq[DComplexMatrixV[N]] 
-    actionPolicy: GaugeActionPolicy 
-    actionParams: GaugeActionCoeffs 
-
-# Main "SpecialUnitaryGauge" constructor
-proc newSpecialUnitaryGauge[L:static[int]](
-    l: Layout[L]; 
-    info: JsonNode;
-    n: static[int];
-  ): auto =
-  ## SpecialUnitaryGauge object constructor
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about U1 or SU(N) gauge field)
-  ##   n: number of "colors"
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  
-  var 
-    actionPolicy: GaugeActionPolicy
-    beta: float
-
-  if not info.hasKey("action"): qexError GaugeError1
-  case info["action"].getStr():
-    of "wilson","Wilson": actionPolicy = Wilson
-    of "rectangle","Rectangle": actionPolicy = Rectangle
-    of "adjoint","Adjoint": actionPolicy = Adjoint
-    of "symanzik","Symanzik": actionPolicy = Symanzik
-    of "luescher-weiss","Luescher-Weiss": actionPolicy = Symanzik
-    of "luscher-weiss", "Luscher-Weiss": actionPolicy = Symanzik
-    of "iwasaki","Iwasaki": actionPolicy = Iwasaki
-    of "doubly-blocked-wilson","doubly-blocked-Wilson","Doubly-Blocked-Wilson":
-      actionPolicy = DoublyBlockedWilson
-    of "dbw","dbw2": actionPolicy =  DoublyBlockedWilson
-    else: 
-      echo GaugeError3
-      throwError info["action"].getStr() & " not a valid action"
-
-  if not info.hasKey("beta"): qexError GaugeError2
-  beta = info["beta"].getFloat()
-
-  # Instantiate "SpecialUnitaryGauge" object & its gauge field
-  result = SpecialUnitaryGauge[L,n](actionPolicy: actionPolicy, info: info)
-  new(result.l); result.l[] = l;
-  result.u = result.l[].newComplexGaugeLinks(n)
-
-  # Set action coefficients
-  case result.actionPolicy:
-    of Wilson: result.actionParams = GaugeActionCoeffs(plaq: beta)
-    of Rectangle: 
-      if not info.hasKey("rectangle-coefficient"): echo GaugeWarning1
-      let rectFac = case info.hasKey("rectangle-coefficient")
-        of true: info["rectangle-coefficient"].getFloat()
-        of false: C1Symanzik
-      result.actionParams = gaugeActRect(beta, rectFac)
-    of Adjoint:
-      if not info.hasKey("adjoint-ratio"): echo GaugeWarning2
-      let adjFac = case info.hasKey("adjoint-ratio")
-        of true: info["adjoint-ratio"].getFloat()
-        of false: BetaAOverBetaF
-      result.actionParams = GaugeActionCoeffs(plaq: beta, adjplaq: beta*adjFac)
-    else: # Nim compiler workaround
-      if result.actionPolicy == Symanzik: 
-        result.actionParams = gaugeActRect(beta, C1Symanzik)
-      elif result.actionPolicy == Iwasaki:
-        result.actionParams = gaugeActRect(beta, C1Iwasaki)
-      elif result.actionPolicy == DoublyBlockedWilson:
-        result.actionParams = gaugeActRect(beta, C1DoublyBlockedWilson)
-
-proc newU1Gauge*(l: Layout; info: JsonNode): auto = 
-  ## Instantiates U1 gauge field
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about U1 gauge field)
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  result = l.newSpecialUnitaryGauge(info,1)
-
-proc newSU2Gauge*(l: Layout; info: JsonNode): auto = 
-  ## Instantiates SU2 gauge field
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about SU2 gauge field)
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  result = l.newSpecialUnitaryGauge(info,2)
-
-proc newSU3Gauge*(l: Layout; info: JsonNode): auto = 
-  ## Instantiates SU3 gauge field
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about SU3 gauge field)
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  result = l.newSpecialUnitaryGauge(info,3)
-
-proc newSU4Gauge*(l: Layout; info: JsonNode): auto = 
-  ## Instantiates SU4 gauge field
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about SU4 gauge field)
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  result = l.newSpecialUnitaryGauge(info,4)
-
-proc newSUNGauge*(l: Layout; info: JsonNode; n: static[int]): auto = 
-  ## Instantiates SUN gauge field
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   info: JsonNode (species information about SU4 gauge field)
-  ##   n: number of colors
-  ## Output:
-  ##   result: SpecialUnitaryGauge object
-  result = l.newSpecialUnitaryGauge(info,n)
-
-proc action*(self: SpecialUnitaryGauge): float =
-  ## Calculate gauge action for special unitary field
-  ## Inputs:
-  ##   self: SpecialUnitaryGauge object
-  ## Outputs:
-  ##   result (float): value of gauge action
-  result = case self.actionPolicy
-    of Adjoint: self.actionParams.actionA(self.u)
-    else: self.actionParams.gaugeAction1(self.u)
-
-proc force*[S](self: SpecialUnitaryGauge; f: seq[S]) =
-  ## Calculate gauge force for special unitary field
-  ## Inputs:
-  ##   self: SpecialUnitaryGauge object
-  ##   f: force field
-  ## Warning: f is written over, not appended to
-  case self.actionPolicy:
-    of Adjoint: self.actionParams.forceA(self.u,f)
-    else: self.actionParams.gaugeForce(self.u,f)
-  
-if isMainModule:
-  qexInit()
-
-  # Create lattice
-  var
-    lat = @[8,8,8,8]
-    lo = newLayout(lat)
-
-  # Instantiate gauge field objects
-  var
-    info = %* {
-      "action": "Wilson",
-      "beta": 7.0
-    }
-    su2 = lo.newSU2Gauge(info)
-    su3 = lo.newSU3Gauge(info)
-    su2f = lo.newComplexGaugeLinks(2)
-    su3f = lo.newComplexGaugeLinks(3)
-
-  # Set u to unit gauge
-  su2.u.unit
-  su3.u.unit
-
-  # Echo unit gauge action
-  echo su2.action, " ", su3.action
-
-  # Calculate unit gauge force
-  su2.force(su2f)
-  su3.force(su3f)
-
-  qexFinalize()
\ No newline at end of file
diff --git a/mcmc/fields/latticeFields.nim b/mcmc/fields/latticeFields.nim
deleted file mode 100644
index 1153471..0000000
--- a/mcmc/fields/latticeFields.nim
+++ /dev/null
@@ -1,127 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/fields/latticeFields.nim
-
-Description: 
-  Defines primitive data types for fields of various gauge groups/representations, 
-  along with their constructors. All such data types are used by other object
-  for whatever manipulations are needed. If your application needs a certain 
-  field data structure, this is the place to define it. 
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-import layout
-import json
-
-type
-  DComplexMatrixV*[N:static[int]] = Field[VLEN,Color[MatrixArray[N,N,DComplexV]]]
-  DComplexOneIdxRep*[N:static[int]] = Color[VectorArray[N,DComplexV]]
-  DComplexBosonOneIdxV*[N:static[int]] = Field[VLEN,DComplexOneIdxRep[N]]
-  DComplexSpinOneIdx*[M,N:static[int]] = Spin[VectorArray[M,DComplexOneIdxRep[N]]]
-  DComplexFermionOneIdxV*[M,N:static[int]] = Field[VLEN,DComplexSpinOneIdx[M,N]]
-
-type
-  LatticeField*[L:static[int]] {.inheritable.} = object
-    ## Lattice field object
-    ## Attributes:
-    ##   l: reference to lattice layout
-    ##   info: JSON data type containing lattice field info
-    l*: ref Layout[L]
-    info*: JsonNode
-
-proc newComplexGaugeLinks*(l: Layout; n: static[int]): auto =
-  ## Creates gauge link field Umu(x) ϵ Mat(nxn,C)
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   n: number of "colors" for fundamental,
-  ##      dimension of representation otherwise
-  ## Ouputs:
-  ##   result: gauge field (DComplexMatrixV)
-  result = newSeq[DComplexMatrixV[n]](l.nDim)
-  for mu in 0..<l.nDim: result[mu].new(l)
-
-proc newComplexBosonOneIdxRep*(l: Layout; n: static[int]): auto = 
-  ## Creates complex representation of gauge group phi(x) ϵ Vec(n,C)
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   n: dimension of one-index representation
-  ## Ouputs:
-  ##   result: boson field (DComplexBosonOneIdxV)
-  result = DComplexBosonOneIdxV[n].new(l)
-
-proc newComplexFermionOneIdxRep*(l: Layout; m,n: static[int]): auto =
-  ## Creates complex representation of gauge group psi(x) ϵ Vec(m,C) ⊗ Vec(n,C)
-  ## Inputs:
-  ##   l: lattice layout (src/layout/)
-  ##   n: dimension of one-index representation
-  ## Ouputs:
-  ##   result: fermion field (DComplexFermionOneIdxV)
-  result = DComplexFermionOneIdxV[m,n].new(l)
-
-proc `:=`*[N:static[int]](v,u: seq[DComplexMatrixV[N]]) =
-  ## Saves "u" field into "mu" field, both of type DComplexMatrixV
-  ## Inputs:
-  ##   u: Input gauge field
-  ##   v: Gauge field to hold "u" values
-  threads:
-    for mu in 0..<u.len: v[mu] := u[mu] 
-
-proc norm2*[N:static[int]](u: seq[DComplexMatrixV[N]]): float =
-  ## Calculate norm of link-like field
-  ## Inputs:
-  ##   u: Input link field
-  ## Outputs:
-  ##   result: sum_mu(|u[mu]|^2)
-  var u2: float
-  threads:
-    var tu2 = 0.0
-    for mu in 0..<u.len: tu2 += u[mu].norm2
-    threadBarrier()
-    threadMaster: u2 = tu2
-  result = u2
-
-if isMainModule:
-  qexInit()
-
-  # Create lattice
-  var
-    lat = @[8,8,8,8]
-    lo = newLayout(lat)
-
-  # Create test fields
-  var
-    u1 = lo.newComplexGaugeLinks(1)
-    su3 = lo.newComplexGaugeLinks(3)
-    su3fbos = lo.newComplexBosonOneIdxRep(3)
-    su3fferm = lo.newComplexFermionOneIdxRep(4,3)
-
-  qexFinalize()
\ No newline at end of file
diff --git a/mcmc/fields/mcmcFields.nim b/mcmc/fields/mcmcFields.nim
deleted file mode 100644
index 06f07ef..0000000
--- a/mcmc/fields/mcmcFields.nim
+++ /dev/null
@@ -1,3 +0,0 @@
-import fermion/staggered/staggeredFermion
-
-export fermion/staggered/staggeredFermion
\ No newline at end of file
diff --git a/mcmc/mcmc/mcmcErrorHandling.nim b/mcmc/mcmc/mcmcErrorHandling.nim
deleted file mode 100644
index 7998822..0000000
--- a/mcmc/mcmc/mcmcErrorHandling.nim
+++ /dev/null
@@ -1,50 +0,0 @@
-#[
-Author: Curtis Taylor Peterson
-
-Contact: curtistaylorpetersonwork@gmail.com
-
-Source file: mcmc/mcmc/mcmcErrorHandling.nim
-
-Description: 
-  Defines generic data and procs for handling errors
-
--- BEGIN LEGAL --
-
-The MIT License (MIT)
-
-Copyright (c) 2017 James C. Osborn
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
--- END LEGAL --
-]#
-
-import qex
-
-proc throwError*(error: string) =
-  var err = ""
-  err.add "|------------------------- QEX error -------------------------|\n"
-  err.add "    " & error & "\n"
-  err.add "  |------------------------- QEX error -------------------------|\n"
-  qexError err
-
-proc throwWarning*(warning: string) =
-  echo "  |------------------------- QEX warning -------------------------|"
-  echo "    " & warning
-  echo "  |------------------------- QEX warning -------------------------|"
\ No newline at end of file