From eb4664edfbe9bf2f7ee4ee8c734e9c5f7ab067db Mon Sep 17 00:00:00 2001
From: Dean Wampler <dean@concurrentthought.com>
Date: Sun, 1 Mar 2020 10:28:55 -0800
Subject: [PATCH] Converted .sc scripts to scala files in a new src/script tree

---
 src/main/scala/progscala3/rounding/Generator.sc               | 3 ---
 .../scala/progscala3/introscala/Upper1.scala}                 | 2 +-
 .../scala/progscala3/introscala/Upper2.scala}                 | 2 +-
 .../objectsystem/linearization/Linearization1.scala}          | 2 +-
 .../objectsystem/linearization/Linearization2.scala}          | 2 +-
 .../objectsystem/linearization/Linearization3.scala}          | 4 ++--
 .../objectsystem/linearization/Linearization4.scala}          | 2 +-
 .../progscala3/objectsystem/overrides/ClassAbsField.scala}    | 2 +-
 .../scala/progscala3/objectsystem/overrides/ClassField.scala} | 2 +-
 .../objectsystem/overrides/PayrollTemplateMethod.scala}       | 2 +-
 .../progscala3/objectsystem/overrides/TraitBadInitVal.scala}  | 2 +-
 .../progscala3/objectsystem/overrides/TraitDefInitVal.scala}  | 2 +-
 .../progscala3/objectsystem/overrides/TraitLazyInitVal.scala} | 2 +-
 .../scala/progscala3/objectsystem/ui/Button.scala}            | 2 +-
 .../scala/progscala3/objectsystem/ui/VetoableClicks.scala}    | 2 +-
 .../scala/progscala3/objectsystem/ui/VetoableClicksUap.scala} | 2 +-
 .../objectsystem/variance/MutableTypeVariance.scala}          | 2 +-
 .../scala/progscala3/patternmatching/HTTPMethods.scala}       | 2 +-
 .../scala/progscala3/patternmatching/Infix.scala}             | 2 +-
 .../scala/progscala3/patternmatching/MatchBoolean.scala}      | 2 +-
 .../scala/progscala3/patternmatching/MatchDeep.scala}         | 2 +-
 .../scala/progscala3/patternmatching/MatchDeep2.scala}        | 2 +-
 .../scala/progscala3/patternmatching/MatchDeepTuple.scala}    | 2 +-
 .../scala/progscala3/patternmatching/MatchFunArgs.scala}      | 2 +-
 .../scala/progscala3/patternmatching/MatchGuard.scala}        | 2 +-
 .../scala/progscala3/patternmatching/MatchList.scala}         | 2 +-
 .../scala/progscala3/patternmatching/MatchRegex.scala}        | 2 +-
 .../scala/progscala3/patternmatching/MatchReverseSeq.scala}   | 2 +-
 .../scala/progscala3/patternmatching/MatchSeq.scala}          | 2 +-
 .../scala/progscala3/patternmatching/MatchSeqParens.scala}    | 2 +-
 .../progscala3/patternmatching/MatchSeqUnapplySeq.scala}      | 2 +-
 .../patternmatching/MatchSeqWithoutUnapplySeq.scala}          | 2 +-
 .../scala/progscala3/patternmatching/MatchSurprise.scala}     | 2 +-
 .../scala/progscala3/patternmatching/MatchSurpriseFix.scala}  | 2 +-
 .../scala/progscala3/patternmatching/MatchTuple.scala}        | 2 +-
 .../scala/progscala3/patternmatching/MatchTypes.scala}        | 2 +-
 .../scala/progscala3/patternmatching/MatchTypesFix.scala}     | 2 +-
 .../scala/progscala3/patternmatching/MatchVararglist.scala}   | 2 +-
 .../scala/progscala3/patternmatching/MatchVariable.scala}     | 2 +-
 .../scala/progscala3/patternmatching/MatchVariable2.scala}    | 2 +-
 .../scala/progscala3/patternmatching/RegexAssignments.scala}  | 2 +-
 .../scala/progscala3/patternmatching/ScopedOptionFor.scala}   | 2 +-
 .../scala/progscala3/rounding/AssignedIf.scala}               | 2 +-
 .../scala/progscala3/rounding/BasicFor.scala}                 | 2 +-
 .../scala/progscala3/rounding/CallByName.scala}               | 2 +-
 .../scala/progscala3/rounding/DaysEnumeration.scala}          | 2 +-
 .../scala/progscala3/rounding/DoWhile.scala}                  | 2 +-
 .../scala/progscala3/rounding/DoubleGuardFor.scala}           | 2 +-
 src/script/scala/progscala3/rounding/Generator.scala          | 3 +++
 .../If.sc => script/scala/progscala3/rounding/If.scala}       | 2 +-
 .../scala/progscala3/rounding/LazyInitVal.scala}              | 2 +-
 .../scala/progscala3/rounding/NoDotBetter.scala}              | 2 +-
 .../scala/progscala3/rounding/ScopedFor.scala}                | 2 +-
 .../scala/progscala3/rounding/ScopedOptionFor.scala}          | 2 +-
 .../scala/progscala3/rounding/Traits.scala}                   | 2 +-
 .../While.sc => script/scala/progscala3/rounding/While.scala} | 2 +-
 .../scala/progscala3/rounding/YieldingFor.scala}              | 2 +-
 .../scala/progscala3/toolslibs/Example.scala}                 | 2 +-
 .../scala/progscala3/traits/TraitConstruction.scala}          | 2 +-
 .../scala/progscala3/traits/ui/ButtonCountObserver.scala}     | 2 +-
 .../scala/progscala3/traits/ui/ButtonCountObserver2.scala}    | 2 +-
 .../scala/progscala3/traits/ui2/ClickCountObserver.scala}     | 2 +-
 .../progscala3/traits/ui2/VetoableClickCountObserver.scala}   | 2 +-
 .../scala/progscala3/typelessdomore/AbstractTypes.scala}      | 4 ++--
 .../scala/progscala3/typelessdomore/Factorial.scala}          | 2 +-
 .../scala/progscala3/typelessdomore/FactorialTailrec.scala}   | 2 +-
 .../scala/progscala3/typelessdomore/FibonacciTailrec.scala}   | 2 +-
 .../scala/progscala3/typelessdomore/Futures.scala}            | 2 +-
 .../scala/progscala3/typelessdomore/ImplicitStrings.scala}    | 2 +-
 .../scala/progscala3/typelessdomore/Loop.scala}               | 2 +-
 .../scala/progscala3/typelessdomore/MapGet.scala}             | 2 +-
 .../typelessdomore/MethodBroadInferenceReturn.scala}          | 2 +-
 .../scala/progscala3/typelessdomore/MethodNestedReturn.scala} | 2 +-
 .../progscala3/typelessdomore/MethodOverloadedReturnV1.scala} | 2 +-
 .../progscala3/typelessdomore/MethodOverloadedReturnV2.scala} | 2 +-
 .../progscala3/typelessdomore/MethodOverloadedReturnV3.scala} | 2 +-
 .../progscala3/typelessdomore/MethodRecursiveReturn.scala}    | 2 +-
 .../scala/progscala3/typelessdomore/MultilineStrings.scala}   | 2 +-
 .../scala/progscala3/typelessdomore/MultilineStrings2.scala}  | 2 +-
 .../scala/progscala3/typelessdomore/ParameterizedTypes.scala} | 4 ++--
 .../scala/progscala3/typelessdomore/PartialFunctions.scala}   | 2 +-
 .../scala/progscala3/typelessdomore/Person.scala}             | 2 +-
 .../scala/progscala3/typelessdomore/Ranges.scala}             | 2 +-
 .../scala/progscala3/typelessdomore/SemicolonExample.scala}   | 2 +-
 .../progscala3/typelessdomore/StateCapitalsSubset.scala}      | 2 +-
 .../scala/progscala3/typelessdomore/TupleExample.scala}       | 2 +-
 .../typesystem/abstracttypes/AbstractTypesEx.scala}           | 2 +-
 .../scala/progscala3/typesystem/bounds/LowerBounds.scala}     | 2 +-
 .../scala/progscala3/typesystem/bounds/LowerBounds2.scala}    | 2 +-
 .../progscala3/typesystem/bounds/ViewBoundsDeprecated.scala}  | 2 +-
 .../progscala3/typesystem/bounds/ViewToContextBounds.scala}   | 2 +-
 .../scala/progscala3/typesystem/bounds/list/ListAb.scala}     | 2 +-
 .../typesystem/dependentmethodtypes/DepMethod.scala}          | 2 +-
 .../typesystem/existentials/TypeErasureWorkaround.scala}      | 2 +-
 .../scala/progscala3/typesystem/higherkinded/Add.scala}       | 2 +-
 .../scala/progscala3/typesystem/higherkinded/AddSeq.scala}    | 2 +-
 .../scala/progscala3/typesystem/higherkinded/Sum.scala}       | 2 +-
 .../scala/progscala3/typesystem/lazy/LazyFibonacci.scala}     | 2 +-
 .../scala/progscala3/typesystem/lazy/LazyInts.scala}          | 2 +-
 .../scala/progscala3/typesystem/recursivetypes/FBound.scala}  | 2 +-
 .../typesystem/selftype/ButtonSubjectObserver.scala}          | 2 +-
 .../progscala3/typesystem/selftype/SelftypeCakePattern.scala} | 2 +-
 .../scala/progscala3/typesystem/selftype/ThisAlias.scala}     | 2 +-
 .../progscala3/typesystem/structuraltypes/Observer.scala}     | 2 +-
 .../progscala3/typesystem/structuraltypes/ObserverFunc.scala} | 2 +-
 .../scala/progscala3/typesystem/typelambdas/Functor.scala}    | 2 +-
 .../progscala3/typesystem/valuetypes/CurriedFunction.scala}   | 2 +-
 .../scala/progscala3/typesystem/valuetypes/InfixTypes.scala}  | 2 +-
 .../scala/progscala3/typesystem/valuetypes/ObjectTypes.scala} | 2 +-
 .../progscala3/typesystem/valuetypes/TypeProjection.scala}    | 2 +-
 .../scala/progscala3/typesystem/valuetypes/TypeTypes.scala}   | 2 +-
 111 files changed, 115 insertions(+), 115 deletions(-)
 delete mode 100644 src/main/scala/progscala3/rounding/Generator.sc
 rename src/{main/scala/progscala3/introscala/Upper1.sc => script/scala/progscala3/introscala/Upper1.scala} (78%)
 rename src/{main/scala/progscala3/introscala/Upper2.sc => script/scala/progscala3/introscala/Upper2.scala} (72%)
 rename src/{main/scala/progscala3/objectsystem/linearization/Linearization1.sc => script/scala/progscala3/objectsystem/linearization/Linearization1.scala} (85%)
 rename src/{main/scala/progscala3/objectsystem/linearization/Linearization2.sc => script/scala/progscala3/objectsystem/linearization/Linearization2.scala} (73%)
 rename src/{main/scala/progscala3/objectsystem/linearization/Linearization3.sc => script/scala/progscala3/objectsystem/linearization/Linearization3.scala} (78%)
 rename src/{main/scala/progscala3/objectsystem/linearization/Linearization4.sc => script/scala/progscala3/objectsystem/linearization/Linearization4.scala} (93%)
 rename src/{main/scala/progscala3/objectsystem/overrides/ClassAbsField.sc => script/scala/progscala3/objectsystem/overrides/ClassAbsField.scala} (78%)
 rename src/{main/scala/progscala3/objectsystem/overrides/ClassField.sc => script/scala/progscala3/objectsystem/overrides/ClassField.scala} (74%)
 rename src/{main/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.sc => script/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.scala} (93%)
 rename src/{main/scala/progscala3/objectsystem/overrides/TraitBadInitVal.sc => script/scala/progscala3/objectsystem/overrides/TraitBadInitVal.scala} (81%)
 rename src/{main/scala/progscala3/objectsystem/overrides/TraitDefInitVal.sc => script/scala/progscala3/objectsystem/overrides/TraitDefInitVal.scala} (79%)
 rename src/{main/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.sc => script/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.scala} (79%)
 rename src/{main/scala/progscala3/objectsystem/ui/Button.sc => script/scala/progscala3/objectsystem/ui/Button.scala} (76%)
 rename src/{main/scala/progscala3/objectsystem/ui/VetoableClicks.sc => script/scala/progscala3/objectsystem/ui/VetoableClicks.scala} (93%)
 rename src/{main/scala/progscala3/objectsystem/ui/VetoableClicksUap.sc => script/scala/progscala3/objectsystem/ui/VetoableClicksUap.scala} (93%)
 rename src/{main/scala/progscala3/objectsystem/variance/MutableTypeVariance.sc => script/scala/progscala3/objectsystem/variance/MutableTypeVariance.scala} (72%)
 rename src/{main/scala/progscala3/patternmatching/HTTPMethods.sc => script/scala/progscala3/patternmatching/HTTPMethods.scala} (96%)
 rename src/{main/scala/progscala3/patternmatching/Infix.sc => script/scala/progscala3/patternmatching/Infix.scala} (85%)
 rename src/{main/scala/progscala3/patternmatching/MatchBoolean.sc => script/scala/progscala3/patternmatching/MatchBoolean.scala} (90%)
 rename src/{main/scala/progscala3/patternmatching/MatchDeep.sc => script/scala/progscala3/patternmatching/MatchDeep.scala} (92%)
 rename src/{main/scala/progscala3/patternmatching/MatchDeep2.sc => script/scala/progscala3/patternmatching/MatchDeep2.scala} (93%)
 rename src/{main/scala/progscala3/patternmatching/MatchDeepTuple.sc => script/scala/progscala3/patternmatching/MatchDeepTuple.scala} (83%)
 rename src/{main/scala/progscala3/patternmatching/MatchFunArgs.sc => script/scala/progscala3/patternmatching/MatchFunArgs.scala} (92%)
 rename src/{main/scala/progscala3/patternmatching/MatchGuard.sc => script/scala/progscala3/patternmatching/MatchGuard.scala} (78%)
 rename src/{main/scala/progscala3/patternmatching/MatchList.sc => script/scala/progscala3/patternmatching/MatchList.scala} (85%)
 rename src/{main/scala/progscala3/patternmatching/MatchRegex.sc => script/scala/progscala3/patternmatching/MatchRegex.scala} (92%)
 rename src/{main/scala/progscala3/patternmatching/MatchReverseSeq.sc => script/scala/progscala3/patternmatching/MatchReverseSeq.scala} (89%)
 rename src/{main/scala/progscala3/patternmatching/MatchSeq.sc => script/scala/progscala3/patternmatching/MatchSeq.scala} (94%)
 rename src/{main/scala/progscala3/patternmatching/MatchSeqParens.sc => script/scala/progscala3/patternmatching/MatchSeqParens.scala} (88%)
 rename src/{main/scala/progscala3/patternmatching/MatchSeqUnapplySeq.sc => script/scala/progscala3/patternmatching/MatchSeqUnapplySeq.scala} (91%)
 rename src/{main/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.sc => script/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.scala} (88%)
 rename src/{main/scala/progscala3/patternmatching/MatchSurprise.sc => script/scala/progscala3/patternmatching/MatchSurprise.scala} (81%)
 rename src/{main/scala/progscala3/patternmatching/MatchSurpriseFix.sc => script/scala/progscala3/patternmatching/MatchSurpriseFix.scala} (86%)
 rename src/{main/scala/progscala3/patternmatching/MatchTuple.sc => script/scala/progscala3/patternmatching/MatchTuple.scala} (88%)
 rename src/{main/scala/progscala3/patternmatching/MatchTypes.sc => script/scala/progscala3/patternmatching/MatchTypes.scala} (84%)
 rename src/{main/scala/progscala3/patternmatching/MatchTypesFix.sc => script/scala/progscala3/patternmatching/MatchTypesFix.scala} (88%)
 rename src/{main/scala/progscala3/patternmatching/MatchVararglist.sc => script/scala/progscala3/patternmatching/MatchVararglist.scala} (94%)
 rename src/{main/scala/progscala3/patternmatching/MatchVariable.sc => script/scala/progscala3/patternmatching/MatchVariable.scala} (90%)
 rename src/{main/scala/progscala3/patternmatching/MatchVariable2.sc => script/scala/progscala3/patternmatching/MatchVariable2.scala} (87%)
 rename src/{main/scala/progscala3/patternmatching/RegexAssignments.sc => script/scala/progscala3/patternmatching/RegexAssignments.scala} (93%)
 rename src/{main/scala/progscala3/patternmatching/ScopedOptionFor.sc => script/scala/progscala3/patternmatching/ScopedOptionFor.scala} (86%)
 rename src/{main/scala/progscala3/rounding/AssignedIf.sc => script/scala/progscala3/rounding/AssignedIf.scala} (79%)
 rename src/{main/scala/progscala3/rounding/BasicFor.sc => script/scala/progscala3/rounding/BasicFor.scala} (59%)
 rename src/{main/scala/progscala3/rounding/CallByName.sc => script/scala/progscala3/rounding/CallByName.scala} (89%)
 rename src/{main/scala/progscala3/rounding/DaysEnumeration.sc => script/scala/progscala3/rounding/DaysEnumeration.scala} (91%)
 rename src/{main/scala/progscala3/rounding/DoWhile.sc => script/scala/progscala3/rounding/DoWhile.scala} (63%)
 rename src/{main/scala/progscala3/rounding/DoubleGuardFor.sc => script/scala/progscala3/rounding/DoubleGuardFor.scala} (81%)
 create mode 100644 src/script/scala/progscala3/rounding/Generator.scala
 rename src/{main/scala/progscala3/rounding/If.sc => script/scala/progscala3/rounding/If.scala} (83%)
 rename src/{main/scala/progscala3/rounding/LazyInitVal.sc => script/scala/progscala3/rounding/LazyInitVal.scala} (68%)
 rename src/{main/scala/progscala3/rounding/NoDotBetter.sc => script/scala/progscala3/rounding/NoDotBetter.scala} (58%)
 rename src/{main/scala/progscala3/rounding/ScopedFor.sc => script/scala/progscala3/rounding/ScopedFor.scala} (66%)
 rename src/{main/scala/progscala3/rounding/ScopedOptionFor.sc => script/scala/progscala3/rounding/ScopedOptionFor.scala} (85%)
 rename src/{main/scala/progscala3/rounding/Traits.sc => script/scala/progscala3/rounding/Traits.scala} (95%)
 rename src/{main/scala/progscala3/rounding/While.sc => script/scala/progscala3/rounding/While.scala} (83%)
 rename src/{main/scala/progscala3/rounding/YieldingFor.sc => script/scala/progscala3/rounding/YieldingFor.scala} (79%)
 rename src/{main/scala/progscala3/toolslibs/Example.sc => script/scala/progscala3/toolslibs/Example.scala} (71%)
 rename src/{main/scala/progscala3/traits/TraitConstruction.sc => script/scala/progscala3/traits/TraitConstruction.scala} (92%)
 rename src/{main/scala/progscala3/traits/ui/ButtonCountObserver.sc => script/scala/progscala3/traits/ui/ButtonCountObserver.scala} (87%)
 rename src/{main/scala/progscala3/traits/ui/ButtonCountObserver2.sc => script/scala/progscala3/traits/ui/ButtonCountObserver2.scala} (89%)
 rename src/{main/scala/progscala3/traits/ui2/ClickCountObserver.sc => script/scala/progscala3/traits/ui2/ClickCountObserver.scala} (89%)
 rename src/{main/scala/progscala3/traits/ui2/VetoableClickCountObserver.sc => script/scala/progscala3/traits/ui2/VetoableClickCountObserver.scala} (90%)
 rename src/{main/scala/progscala3/typelessdomore/AbstractTypes.sc => script/scala/progscala3/typelessdomore/AbstractTypes.scala} (81%)
 rename src/{main/scala/progscala3/typelessdomore/Factorial.sc => script/scala/progscala3/typelessdomore/Factorial.scala} (77%)
 rename src/{main/scala/progscala3/typelessdomore/FactorialTailrec.sc => script/scala/progscala3/typelessdomore/FactorialTailrec.scala} (78%)
 rename src/{main/scala/progscala3/typelessdomore/FibonacciTailrec.sc => script/scala/progscala3/typelessdomore/FibonacciTailrec.scala} (72%)
 rename src/{main/scala/progscala3/typelessdomore/Futures.sc => script/scala/progscala3/typelessdomore/Futures.scala} (92%)
 rename src/{main/scala/progscala3/typelessdomore/ImplicitStrings.sc => script/scala/progscala3/typelessdomore/ImplicitStrings.scala} (54%)
 rename src/{main/scala/progscala3/typelessdomore/Loop.sc => script/scala/progscala3/typelessdomore/Loop.scala} (83%)
 rename src/{main/scala/progscala3/typelessdomore/MapGet.sc => script/scala/progscala3/typelessdomore/MapGet.scala} (93%)
 rename src/{main/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.sc => script/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.scala} (75%)
 rename src/{main/scala/progscala3/typelessdomore/MethodNestedReturn.sc => script/scala/progscala3/typelessdomore/MethodNestedReturn.scala} (76%)
 rename src/{main/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.sc => script/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.scala} (80%)
 rename src/{main/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.sc => script/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.scala} (83%)
 rename src/{main/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.sc => script/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.scala} (87%)
 rename src/{main/scala/progscala3/typelessdomore/MethodRecursiveReturn.sc => script/scala/progscala3/typelessdomore/MethodRecursiveReturn.scala} (80%)
 rename src/{main/scala/progscala3/typelessdomore/MultilineStrings.sc => script/scala/progscala3/typelessdomore/MultilineStrings.scala} (72%)
 rename src/{main/scala/progscala3/typelessdomore/MultilineStrings2.sc => script/scala/progscala3/typelessdomore/MultilineStrings2.scala} (68%)
 rename src/{main/scala/progscala3/typelessdomore/ParameterizedTypes.sc => script/scala/progscala3/typelessdomore/ParameterizedTypes.scala} (81%)
 rename src/{main/scala/progscala3/typelessdomore/PartialFunctions.sc => script/scala/progscala3/typelessdomore/PartialFunctions.scala} (94%)
 rename src/{main/scala/progscala3/typelessdomore/Person.sc => script/scala/progscala3/typelessdomore/Person.scala} (71%)
 rename src/{main/scala/progscala3/typelessdomore/Ranges.sc => script/scala/progscala3/typelessdomore/Ranges.scala} (86%)
 rename src/{main/scala/progscala3/typelessdomore/SemicolonExample.sc => script/scala/progscala3/typelessdomore/SemicolonExample.scala} (86%)
 rename src/{main/scala/progscala3/typelessdomore/StateCapitalsSubset.sc => script/scala/progscala3/typelessdomore/StateCapitalsSubset.scala} (86%)
 rename src/{main/scala/progscala3/typelessdomore/TupleExample.sc => script/scala/progscala3/typelessdomore/TupleExample.scala} (88%)
 rename src/{main/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.sc => script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala} (94%)
 rename src/{main/scala/progscala3/typesystem/bounds/LowerBounds.sc => script/scala/progscala3/typesystem/bounds/LowerBounds.scala} (92%)
 rename src/{main/scala/progscala3/typesystem/bounds/LowerBounds2.sc => script/scala/progscala3/typesystem/bounds/LowerBounds2.scala} (92%)
 rename src/{main/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.sc => script/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.scala} (92%)
 rename src/{main/scala/progscala3/typesystem/bounds/ViewToContextBounds.sc => script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala} (92%)
 rename src/{main/scala/progscala3/typesystem/bounds/list/ListAb.sc => script/scala/progscala3/typesystem/bounds/list/ListAb.scala} (87%)
 rename src/{main/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.sc => script/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.scala} (89%)
 rename src/{main/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.sc => script/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.scala} (79%)
 rename src/{main/scala/progscala3/typesystem/higherkinded/Add.sc => script/scala/progscala3/typesystem/higherkinded/Add.scala} (91%)
 rename src/{main/scala/progscala3/typesystem/higherkinded/AddSeq.sc => script/scala/progscala3/typesystem/higherkinded/AddSeq.scala} (83%)
 rename src/{main/scala/progscala3/typesystem/higherkinded/Sum.sc => script/scala/progscala3/typesystem/higherkinded/Sum.scala} (90%)
 rename src/{main/scala/progscala3/typesystem/lazy/LazyFibonacci.sc => script/scala/progscala3/typesystem/lazy/LazyFibonacci.scala} (73%)
 rename src/{main/scala/progscala3/typesystem/lazy/LazyInts.sc => script/scala/progscala3/typesystem/lazy/LazyInts.scala} (83%)
 rename src/{main/scala/progscala3/typesystem/recursivetypes/FBound.sc => script/scala/progscala3/typesystem/recursivetypes/FBound.scala} (93%)
 rename src/{main/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.sc => script/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.scala} (82%)
 rename src/{main/scala/progscala3/typesystem/selftype/SelftypeCakePattern.sc => script/scala/progscala3/typesystem/selftype/SelftypeCakePattern.scala} (92%)
 rename src/{main/scala/progscala3/typesystem/selftype/ThisAlias.sc => script/scala/progscala3/typesystem/selftype/ThisAlias.scala} (87%)
 rename src/{main/scala/progscala3/typesystem/structuraltypes/Observer.sc => script/scala/progscala3/typesystem/structuraltypes/Observer.scala} (91%)
 rename src/{main/scala/progscala3/typesystem/structuraltypes/ObserverFunc.sc => script/scala/progscala3/typesystem/structuraltypes/ObserverFunc.scala} (89%)
 rename src/{main/scala/progscala3/typesystem/typelambdas/Functor.sc => script/scala/progscala3/typesystem/typelambdas/Functor.scala} (85%)
 rename src/{main/scala/progscala3/typesystem/valuetypes/CurriedFunction.sc => script/scala/progscala3/typesystem/valuetypes/CurriedFunction.scala} (83%)
 rename src/{main/scala/progscala3/typesystem/valuetypes/InfixTypes.sc => script/scala/progscala3/typesystem/valuetypes/InfixTypes.scala} (88%)
 rename src/{main/scala/progscala3/typesystem/valuetypes/ObjectTypes.sc => script/scala/progscala3/typesystem/valuetypes/ObjectTypes.scala} (81%)
 rename src/{main/scala/progscala3/typesystem/valuetypes/TypeProjection.sc => script/scala/progscala3/typesystem/valuetypes/TypeProjection.scala} (81%)
 rename src/{main/scala/progscala3/typesystem/valuetypes/TypeTypes.sc => script/scala/progscala3/typesystem/valuetypes/TypeTypes.scala} (84%)

diff --git a/src/main/scala/progscala3/rounding/Generator.sc b/src/main/scala/progscala3/rounding/Generator.sc
deleted file mode 100644
index 653e92ae..00000000
--- a/src/main/scala/progscala3/rounding/Generator.sc
+++ /dev/null
@@ -1,3 +0,0 @@
-// src/main/scala/progscala3/rounding/Generator.sc
-
-for (i <- 1 to 10) println(i)
diff --git a/src/main/scala/progscala3/introscala/Upper1.sc b/src/script/scala/progscala3/introscala/Upper1.scala
similarity index 78%
rename from src/main/scala/progscala3/introscala/Upper1.sc
rename to src/script/scala/progscala3/introscala/Upper1.scala
index b8e6252c..5d7b9db8 100644
--- a/src/main/scala/progscala3/introscala/Upper1.sc
+++ b/src/script/scala/progscala3/introscala/Upper1.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/introscala/Upper1.sc
+// src/script/scala/progscala3/introscala/Upper1.scala
 
 class Upper {
   def upper(strings: String*): Seq[String] = {
diff --git a/src/main/scala/progscala3/introscala/Upper2.sc b/src/script/scala/progscala3/introscala/Upper2.scala
similarity index 72%
rename from src/main/scala/progscala3/introscala/Upper2.sc
rename to src/script/scala/progscala3/introscala/Upper2.scala
index ce5f4e33..3a234541 100644
--- a/src/main/scala/progscala3/introscala/Upper2.sc
+++ b/src/script/scala/progscala3/introscala/Upper2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/introscala/Upper2.sc
+// src/script/scala/progscala3/introscala/Upper2.scala
 
 object Upper {
   def upper(strings: String*) = strings.map(_.toUpperCase())
diff --git a/src/main/scala/progscala3/objectsystem/linearization/Linearization1.sc b/src/script/scala/progscala3/objectsystem/linearization/Linearization1.scala
similarity index 85%
rename from src/main/scala/progscala3/objectsystem/linearization/Linearization1.sc
rename to src/script/scala/progscala3/objectsystem/linearization/Linearization1.scala
index 9ff6c34a..8bcd39cd 100644
--- a/src/main/scala/progscala3/objectsystem/linearization/Linearization1.sc
+++ b/src/script/scala/progscala3/objectsystem/linearization/Linearization1.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/linearization/Linearization1.sc
+// src/script/scala/progscala3/objectsystem/linearization/Linearization1.scala
 
 class C1 {
   def m(): String = "C1 "
diff --git a/src/main/scala/progscala3/objectsystem/linearization/Linearization2.sc b/src/script/scala/progscala3/objectsystem/linearization/Linearization2.scala
similarity index 73%
rename from src/main/scala/progscala3/objectsystem/linearization/Linearization2.sc
rename to src/script/scala/progscala3/objectsystem/linearization/Linearization2.scala
index fa8a0186..122e5fdb 100644
--- a/src/main/scala/progscala3/objectsystem/linearization/Linearization2.sc
+++ b/src/script/scala/progscala3/objectsystem/linearization/Linearization2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/linearization/Linearization2.sc
+// src/script/scala/progscala3/objectsystem/linearization/Linearization2.scala
 
 class C1 {
   print("C1 ")
diff --git a/src/main/scala/progscala3/objectsystem/linearization/Linearization3.sc b/src/script/scala/progscala3/objectsystem/linearization/Linearization3.scala
similarity index 78%
rename from src/main/scala/progscala3/objectsystem/linearization/Linearization3.sc
rename to src/script/scala/progscala3/objectsystem/linearization/Linearization3.scala
index f376b440..bcce7253 100644
--- a/src/main/scala/progscala3/objectsystem/linearization/Linearization3.sc
+++ b/src/script/scala/progscala3/objectsystem/linearization/Linearization3.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/linearization/Linearization3.sc
+// src/script/scala/progscala3/objectsystem/linearization/Linearization3.scala
 
 class C1 {
   def m(previous: String): String = s"C1($previous)"
@@ -21,4 +21,4 @@ class C2 extends T1 with T2 with T3 {
 }
 
 val c2 = new C2
-assert(c2.m("_") == "C1(T1(T2(T3(C2(_)))))")
\ No newline at end of file
+assert(c2.m("_") == "C1(T1(T2(T3(C2(_)))))")
diff --git a/src/main/scala/progscala3/objectsystem/linearization/Linearization4.sc b/src/script/scala/progscala3/objectsystem/linearization/Linearization4.scala
similarity index 93%
rename from src/main/scala/progscala3/objectsystem/linearization/Linearization4.sc
rename to src/script/scala/progscala3/objectsystem/linearization/Linearization4.scala
index 220ba7a0..2fb71a65 100644
--- a/src/main/scala/progscala3/objectsystem/linearization/Linearization4.sc
+++ b/src/script/scala/progscala3/objectsystem/linearization/Linearization4.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/linearization/Linearization4.sc
+// src/script/scala/progscala3/objectsystem/linearization/Linearization4.scala
 // This same code is in src/test/.../linearization/LinearizationSuite.scala
 class C1 {
   def m(): String = "C1 "
diff --git a/src/main/scala/progscala3/objectsystem/overrides/ClassAbsField.sc b/src/script/scala/progscala3/objectsystem/overrides/ClassAbsField.scala
similarity index 78%
rename from src/main/scala/progscala3/objectsystem/overrides/ClassAbsField.sc
rename to src/script/scala/progscala3/objectsystem/overrides/ClassAbsField.scala
index a58e7e20..088ab144 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/ClassAbsField.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/ClassAbsField.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/ClassAbsField.sc
+// src/script/scala/progscala3/objectsystem/overrides/ClassAbsField.scala
 
 abstract class AbstractC1 {
   val name: String
diff --git a/src/main/scala/progscala3/objectsystem/overrides/ClassField.sc b/src/script/scala/progscala3/objectsystem/overrides/ClassField.scala
similarity index 74%
rename from src/main/scala/progscala3/objectsystem/overrides/ClassField.sc
rename to src/script/scala/progscala3/objectsystem/overrides/ClassField.scala
index 40600012..5d0d93d6 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/ClassField.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/ClassField.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/ClassField.sc
+// src/script/scala/progscala3/objectsystem/overrides/ClassField.scala
 
 class C1 {
   val name = "C1"
diff --git a/src/main/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.sc b/src/script/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.scala
similarity index 93%
rename from src/main/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.sc
rename to src/script/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.scala
index 8422f67b..f7ce03eb 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.sc
+// src/script/scala/progscala3/objectsystem/overrides/PayrollTemplateMethod.scala
 
 case class Address(city: String, state: String, zip: String)
 case class Employee(name: String, salary: Double, address: Address)
diff --git a/src/main/scala/progscala3/objectsystem/overrides/TraitBadInitVal.sc b/src/script/scala/progscala3/objectsystem/overrides/TraitBadInitVal.scala
similarity index 81%
rename from src/main/scala/progscala3/objectsystem/overrides/TraitBadInitVal.sc
rename to src/script/scala/progscala3/objectsystem/overrides/TraitBadInitVal.scala
index db65590c..fe9d2a6a 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/TraitBadInitVal.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/TraitBadInitVal.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/TraitBadInitVal.sc
+// src/script/scala/progscala3/objectsystem/overrides/TraitBadInitVal.scala
 // ERROR: "value" read before initialized.
 
 trait AbstractT1 {
diff --git a/src/main/scala/progscala3/objectsystem/overrides/TraitDefInitVal.sc b/src/script/scala/progscala3/objectsystem/overrides/TraitDefInitVal.scala
similarity index 79%
rename from src/main/scala/progscala3/objectsystem/overrides/TraitDefInitVal.sc
rename to src/script/scala/progscala3/objectsystem/overrides/TraitDefInitVal.scala
index 060e9c05..0ab57550 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/TraitDefInitVal.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/TraitDefInitVal.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/TraitDefInitVal.sc
+// src/script/scala/progscala3/objectsystem/overrides/TraitDefInitVal.scala
 
 trait AbstractT3 {
   println("In AbstractT3:")
diff --git a/src/main/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.sc b/src/script/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.scala
similarity index 79%
rename from src/main/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.sc
rename to src/script/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.scala
index b93cec27..f17f4de2 100644
--- a/src/main/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.sc
+++ b/src/script/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.sc
+// src/script/scala/progscala3/objectsystem/overrides/TraitLazyInitVal.scala
 
 trait AbstractT2 {
   println("In AbstractT2:")
diff --git a/src/main/scala/progscala3/objectsystem/ui/Button.sc b/src/script/scala/progscala3/objectsystem/ui/Button.scala
similarity index 76%
rename from src/main/scala/progscala3/objectsystem/ui/Button.sc
rename to src/script/scala/progscala3/objectsystem/ui/Button.scala
index e3c914de..bf273aed 100644
--- a/src/main/scala/progscala3/objectsystem/ui/Button.sc
+++ b/src/script/scala/progscala3/objectsystem/ui/Button.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/ui/Button.sc
+// src/script/scala/progscala3/objectsystem/ui/Button.scala
 import progscala3.objectsystem.ui.Button
 
 val b = new Button("Submit")
diff --git a/src/main/scala/progscala3/objectsystem/ui/VetoableClicks.sc b/src/script/scala/progscala3/objectsystem/ui/VetoableClicks.scala
similarity index 93%
rename from src/main/scala/progscala3/objectsystem/ui/VetoableClicks.sc
rename to src/script/scala/progscala3/objectsystem/ui/VetoableClicks.scala
index d8a7ba37..51358c07 100644
--- a/src/main/scala/progscala3/objectsystem/ui/VetoableClicks.sc
+++ b/src/script/scala/progscala3/objectsystem/ui/VetoableClicks.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/ui/VetoableClicks.sc
+// src/script/scala/progscala3/objectsystem/ui/VetoableClicks.scala
 import progscala3.objectsystem.ui.Button
 import progscala3.traits.ui2.{Clickable, ObservableClicks, VetoableClicks}
 import progscala3.traits.observer._
diff --git a/src/main/scala/progscala3/objectsystem/ui/VetoableClicksUap.sc b/src/script/scala/progscala3/objectsystem/ui/VetoableClicksUap.scala
similarity index 93%
rename from src/main/scala/progscala3/objectsystem/ui/VetoableClicksUap.sc
rename to src/script/scala/progscala3/objectsystem/ui/VetoableClicksUap.scala
index ea1331a4..93f0c41e 100644
--- a/src/main/scala/progscala3/objectsystem/ui/VetoableClicksUap.sc
+++ b/src/script/scala/progscala3/objectsystem/ui/VetoableClicksUap.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/ui/VetoableClicksUap.sc
+// src/script/scala/progscala3/objectsystem/ui/VetoableClicksUap.scala
 import progscala3.objectsystem.ui.Button
 import progscala3.traits.ui2.{Clickable, ObservableClicks}
 import progscala3.traits.observer._
diff --git a/src/main/scala/progscala3/objectsystem/variance/MutableTypeVariance.sc b/src/script/scala/progscala3/objectsystem/variance/MutableTypeVariance.scala
similarity index 72%
rename from src/main/scala/progscala3/objectsystem/variance/MutableTypeVariance.sc
rename to src/script/scala/progscala3/objectsystem/variance/MutableTypeVariance.scala
index a6157df2..949fc440 100644
--- a/src/main/scala/progscala3/objectsystem/variance/MutableTypeVariance.sc
+++ b/src/script/scala/progscala3/objectsystem/variance/MutableTypeVariance.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/objectsystem/variance/MutableTypeVariance.sc
+// src/script/scala/progscala3/objectsystem/variance/MutableTypeVariance.scala
 // WON'T COMPILE: Parameterized types for vars can’t have variance annotations
 
 class ContainerPlus[+A](var value: A)      // COMPILATION ERROR
diff --git a/src/main/scala/progscala3/patternmatching/HTTPMethods.sc b/src/script/scala/progscala3/patternmatching/HTTPMethods.scala
similarity index 96%
rename from src/main/scala/progscala3/patternmatching/HTTPMethods.sc
rename to src/script/scala/progscala3/patternmatching/HTTPMethods.scala
index 3bdb41a8..35075c36 100644
--- a/src/main/scala/progscala3/patternmatching/HTTPMethods.sc
+++ b/src/script/scala/progscala3/patternmatching/HTTPMethods.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/HTTPMethods.sc
+// src/script/scala/progscala3/patternmatching/HTTPMethods.scala
 
 sealed abstract class HttpMethod() {                                 // <1>
     def body: String                                                 // <2>
diff --git a/src/main/scala/progscala3/patternmatching/Infix.sc b/src/script/scala/progscala3/patternmatching/Infix.scala
similarity index 85%
rename from src/main/scala/progscala3/patternmatching/Infix.sc
rename to src/script/scala/progscala3/patternmatching/Infix.scala
index edbd82be..c9df1285 100644
--- a/src/main/scala/progscala3/patternmatching/Infix.sc
+++ b/src/script/scala/progscala3/patternmatching/Infix.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/Infix.sc
+// src/script/scala/progscala3/patternmatching/Infix.scala
 
 case class With[A,B](a: A, b: B)
 
diff --git a/src/main/scala/progscala3/patternmatching/MatchBoolean.sc b/src/script/scala/progscala3/patternmatching/MatchBoolean.scala
similarity index 90%
rename from src/main/scala/progscala3/patternmatching/MatchBoolean.sc
rename to src/script/scala/progscala3/patternmatching/MatchBoolean.scala
index ad33f8cc..b650d719 100644
--- a/src/main/scala/progscala3/patternmatching/MatchBoolean.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchBoolean.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchBoolean.sc
+// src/script/scala/progscala3/patternmatching/MatchBoolean.scala
 
 val bools = Seq(true, false)
 
diff --git a/src/main/scala/progscala3/patternmatching/MatchDeep.sc b/src/script/scala/progscala3/patternmatching/MatchDeep.scala
similarity index 92%
rename from src/main/scala/progscala3/patternmatching/MatchDeep.sc
rename to src/script/scala/progscala3/patternmatching/MatchDeep.scala
index 94ec59aa..ed5c3741 100644
--- a/src/main/scala/progscala3/patternmatching/MatchDeep.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchDeep.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchDeep.sc
+// src/script/scala/progscala3/patternmatching/MatchDeep.scala
 
 // Simplistic address type. Using all strings is questionable, too.
 case class Address(street: String, city: String, country: String)
diff --git a/src/main/scala/progscala3/patternmatching/MatchDeep2.sc b/src/script/scala/progscala3/patternmatching/MatchDeep2.scala
similarity index 93%
rename from src/main/scala/progscala3/patternmatching/MatchDeep2.sc
rename to src/script/scala/progscala3/patternmatching/MatchDeep2.scala
index 72b279d6..bb3fa461 100644
--- a/src/main/scala/progscala3/patternmatching/MatchDeep2.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchDeep2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchDeep2.sc
+// src/script/scala/progscala3/patternmatching/MatchDeep2.scala
 
 case class Address(street: String, city: String, country: String)
 case class Person(name: String, age: Int, address: Address)
diff --git a/src/main/scala/progscala3/patternmatching/MatchDeepTuple.sc b/src/script/scala/progscala3/patternmatching/MatchDeepTuple.scala
similarity index 83%
rename from src/main/scala/progscala3/patternmatching/MatchDeepTuple.sc
rename to src/script/scala/progscala3/patternmatching/MatchDeepTuple.scala
index 82a2f41c..7d4eadd1 100644
--- a/src/main/scala/progscala3/patternmatching/MatchDeepTuple.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchDeepTuple.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchDeepTuple.sc
+// src/script/scala/progscala3/patternmatching/MatchDeepTuple.scala
 
 val itemsCosts = Seq(("Pencil", 0.52), ("Paper", 1.35), ("Notebook", 2.43))
 val itemsCostsIndices = itemsCosts.zipWithIndex
diff --git a/src/main/scala/progscala3/patternmatching/MatchFunArgs.sc b/src/script/scala/progscala3/patternmatching/MatchFunArgs.scala
similarity index 92%
rename from src/main/scala/progscala3/patternmatching/MatchFunArgs.sc
rename to src/script/scala/progscala3/patternmatching/MatchFunArgs.scala
index de29ee33..bb6bd888 100644
--- a/src/main/scala/progscala3/patternmatching/MatchFunArgs.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchFunArgs.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchFunArgs.sc
+// src/script/scala/progscala3/patternmatching/MatchFunArgs.scala
 
 case class Address(street: String, city: String, country: String)
 case class Person(name: String, age: Int)
diff --git a/src/main/scala/progscala3/patternmatching/MatchGuard.sc b/src/script/scala/progscala3/patternmatching/MatchGuard.scala
similarity index 78%
rename from src/main/scala/progscala3/patternmatching/MatchGuard.sc
rename to src/script/scala/progscala3/patternmatching/MatchGuard.scala
index ca32d86a..56ff76db 100644
--- a/src/main/scala/progscala3/patternmatching/MatchGuard.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchGuard.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchGuard.sc
+// src/script/scala/progscala3/patternmatching/MatchGuard.scala
 
 val results = Seq(1,2,3,4) map {
   case e if e%2 == 0 => s"even: $e"                          // <1>
diff --git a/src/main/scala/progscala3/patternmatching/MatchList.sc b/src/script/scala/progscala3/patternmatching/MatchList.scala
similarity index 85%
rename from src/main/scala/progscala3/patternmatching/MatchList.sc
rename to src/script/scala/progscala3/patternmatching/MatchList.scala
index a3845eeb..bdda2fc8 100644
--- a/src/main/scala/progscala3/patternmatching/MatchList.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchList.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchList.sc
+// src/script/scala/progscala3/patternmatching/MatchList.scala
 
 val nonEmptyList = List(1, 2, 3, 4, 5)
 val emptyList    = Nil
diff --git a/src/main/scala/progscala3/patternmatching/MatchRegex.sc b/src/script/scala/progscala3/patternmatching/MatchRegex.scala
similarity index 92%
rename from src/main/scala/progscala3/patternmatching/MatchRegex.sc
rename to src/script/scala/progscala3/patternmatching/MatchRegex.scala
index dd43b25c..06bba715 100644
--- a/src/main/scala/progscala3/patternmatching/MatchRegex.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchRegex.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchRegex.sc
+// src/script/scala/progscala3/patternmatching/MatchRegex.scala
 
 val BookExtractorRE = """Book: title=([^,]+),\s+author=(.+)""".r     // <1>
 val MagazineExtractorRE = """Magazine: title=([^,]+),\s+issue=(.+)""".r
diff --git a/src/main/scala/progscala3/patternmatching/MatchReverseSeq.sc b/src/script/scala/progscala3/patternmatching/MatchReverseSeq.scala
similarity index 89%
rename from src/main/scala/progscala3/patternmatching/MatchReverseSeq.sc
rename to src/script/scala/progscala3/patternmatching/MatchReverseSeq.scala
index 4decafad..c4db7e7b 100644
--- a/src/main/scala/progscala3/patternmatching/MatchReverseSeq.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchReverseSeq.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchReverseSeq.sc
+// src/script/scala/progscala3/patternmatching/MatchReverseSeq.scala
 // Compare to match-seq.sc
 
 val nonEmptyList   = List(1, 2, 3, 4, 5)
diff --git a/src/main/scala/progscala3/patternmatching/MatchSeq.sc b/src/script/scala/progscala3/patternmatching/MatchSeq.scala
similarity index 94%
rename from src/main/scala/progscala3/patternmatching/MatchSeq.sc
rename to src/script/scala/progscala3/patternmatching/MatchSeq.scala
index 99d91efd..092b54d9 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSeq.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSeq.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSeq.sc
+// src/script/scala/progscala3/patternmatching/MatchSeq.scala
 
 val nonEmptySeq    = Seq(1, 2, 3, 4, 5)                              // <1>
 val emptySeq       = Seq.empty[Int]
diff --git a/src/main/scala/progscala3/patternmatching/MatchSeqParens.sc b/src/script/scala/progscala3/patternmatching/MatchSeqParens.scala
similarity index 88%
rename from src/main/scala/progscala3/patternmatching/MatchSeqParens.sc
rename to src/script/scala/progscala3/patternmatching/MatchSeqParens.scala
index f1476a65..467592d5 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSeqParens.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSeqParens.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSeqParens.sc
+// src/script/scala/progscala3/patternmatching/MatchSeqParens.scala
 
 val nonEmptySeq    = Seq(1, 2, 3, 4, 5)
 val emptySeq       = Seq.empty[Int]
diff --git a/src/main/scala/progscala3/patternmatching/MatchSeqUnapplySeq.sc b/src/script/scala/progscala3/patternmatching/MatchSeqUnapplySeq.scala
similarity index 91%
rename from src/main/scala/progscala3/patternmatching/MatchSeqUnapplySeq.sc
rename to src/script/scala/progscala3/patternmatching/MatchSeqUnapplySeq.scala
index fb232a3d..d9bdca25 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSeqUnapplySeq.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSeqUnapplySeq.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSeqUnapplySeq.sc
+// src/script/scala/progscala3/patternmatching/MatchSeqUnapplySeq.scala
 
 val nonEmptyList   = List(1, 2, 3, 4, 5)                             // <1>
 val emptyList      = Nil
diff --git a/src/main/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.sc b/src/script/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.scala
similarity index 88%
rename from src/main/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.sc
rename to src/script/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.scala
index 172998e5..0c74a574 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.sc
+// src/script/scala/progscala3/patternmatching/MatchSeqWithoutUnapplySeq.scala
 
 val nonEmptyList   = List(1, 2, 3, 4, 5)
 val emptyList      = Nil
diff --git a/src/main/scala/progscala3/patternmatching/MatchSurprise.sc b/src/script/scala/progscala3/patternmatching/MatchSurprise.scala
similarity index 81%
rename from src/main/scala/progscala3/patternmatching/MatchSurprise.sc
rename to src/script/scala/progscala3/patternmatching/MatchSurprise.scala
index 3a491ff2..743f9228 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSurprise.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSurprise.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSurprise.sc
+// src/script/scala/progscala3/patternmatching/MatchSurprise.scala
 // Does not compile with strict warnings, because of <2>.
 
 def checkY(y: Int): Seq[String] = {
diff --git a/src/main/scala/progscala3/patternmatching/MatchSurpriseFix.sc b/src/script/scala/progscala3/patternmatching/MatchSurpriseFix.scala
similarity index 86%
rename from src/main/scala/progscala3/patternmatching/MatchSurpriseFix.sc
rename to src/script/scala/progscala3/patternmatching/MatchSurpriseFix.scala
index 2d84ed9a..d20f8c7b 100644
--- a/src/main/scala/progscala3/patternmatching/MatchSurpriseFix.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchSurpriseFix.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchSurpriseFix.sc
+// src/script/scala/progscala3/patternmatching/MatchSurpriseFix.scala
 
 def checkY(y: Int): Seq[String] = {
   for {
diff --git a/src/main/scala/progscala3/patternmatching/MatchTuple.sc b/src/script/scala/progscala3/patternmatching/MatchTuple.scala
similarity index 88%
rename from src/main/scala/progscala3/patternmatching/MatchTuple.sc
rename to src/script/scala/progscala3/patternmatching/MatchTuple.scala
index 5fd34576..a6d8abd4 100644
--- a/src/main/scala/progscala3/patternmatching/MatchTuple.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchTuple.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchTuple.sc
+// src/script/scala/progscala3/patternmatching/MatchTuple.scala
 
 val langs = Seq(
   ("Scala",   "Martin", "Odersky"),
diff --git a/src/main/scala/progscala3/patternmatching/MatchTypes.sc b/src/script/scala/progscala3/patternmatching/MatchTypes.scala
similarity index 84%
rename from src/main/scala/progscala3/patternmatching/MatchTypes.sc
rename to src/script/scala/progscala3/patternmatching/MatchTypes.scala
index bf26b76a..217b66b4 100644
--- a/src/main/scala/progscala3/patternmatching/MatchTypes.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchTypes.sc
+// src/script/scala/progscala3/patternmatching/MatchTypes.scala
 // Does not compile with strict warnings, because of type erasure,
 // the compiler can't distinguish between Seq[X] and Seq[Y], as
 // written.
diff --git a/src/main/scala/progscala3/patternmatching/MatchTypesFix.sc b/src/script/scala/progscala3/patternmatching/MatchTypesFix.scala
similarity index 88%
rename from src/main/scala/progscala3/patternmatching/MatchTypesFix.sc
rename to src/script/scala/progscala3/patternmatching/MatchTypesFix.scala
index c9ce3f65..5041d03d 100644
--- a/src/main/scala/progscala3/patternmatching/MatchTypesFix.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchTypesFix.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchTypesFix.sc
+// src/script/scala/progscala3/patternmatching/MatchTypesFix.scala
 
 def doSeqMatch[T](seq: Seq[T]): String = seq match {
   case Nil => "Nothing"
diff --git a/src/main/scala/progscala3/patternmatching/MatchVararglist.sc b/src/script/scala/progscala3/patternmatching/MatchVararglist.scala
similarity index 94%
rename from src/main/scala/progscala3/patternmatching/MatchVararglist.sc
rename to src/script/scala/progscala3/patternmatching/MatchVararglist.scala
index 27a89f0d..47585adc 100644
--- a/src/main/scala/progscala3/patternmatching/MatchVararglist.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchVararglist.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchVararglist.sc
+// src/script/scala/progscala3/patternmatching/MatchVararglist.scala
 
 // Operators for WHERE clauses
 object Op extends Enumeration {                                      // <1>
diff --git a/src/main/scala/progscala3/patternmatching/MatchVariable.sc b/src/script/scala/progscala3/patternmatching/MatchVariable.scala
similarity index 90%
rename from src/main/scala/progscala3/patternmatching/MatchVariable.sc
rename to src/script/scala/progscala3/patternmatching/MatchVariable.scala
index 7868d852..abdbadb4 100644
--- a/src/main/scala/progscala3/patternmatching/MatchVariable.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchVariable.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/MatchVariable.sc
+// src/script/scala/progscala3/patternmatching/MatchVariable.scala
 
 val result = Seq(1, "one", 2, 3.14, "four", Symbol("five")) map {  // <1>
   case 1          => "int 1"                                       // <3>
diff --git a/src/main/scala/progscala3/patternmatching/MatchVariable2.sc b/src/script/scala/progscala3/patternmatching/MatchVariable2.scala
similarity index 87%
rename from src/main/scala/progscala3/patternmatching/MatchVariable2.sc
rename to src/script/scala/progscala3/patternmatching/MatchVariable2.scala
index 1915a328..945bd70e 100644
--- a/src/main/scala/progscala3/patternmatching/MatchVariable2.sc
+++ b/src/script/scala/progscala3/patternmatching/MatchVariable2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/match-variable3.sc
+// src/script/scala/progscala3/patternmatching/match-variable3.sc
 
 val result = Seq(1, "one", 2, 3.14, "four", Symbol("five")) map {
   str => str match {                                      // <1>
diff --git a/src/main/scala/progscala3/patternmatching/RegexAssignments.sc b/src/script/scala/progscala3/patternmatching/RegexAssignments.scala
similarity index 93%
rename from src/main/scala/progscala3/patternmatching/RegexAssignments.sc
rename to src/script/scala/progscala3/patternmatching/RegexAssignments.scala
index 5f42e954..964a13ea 100644
--- a/src/main/scala/progscala3/patternmatching/RegexAssignments.sc
+++ b/src/script/scala/progscala3/patternmatching/RegexAssignments.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/RegexAssignments.sc
+// src/script/scala/progscala3/patternmatching/RegexAssignments.scala
 
 val cols = """\*|[\w, ]+"""
 val table = """\w+"""
diff --git a/src/main/scala/progscala3/patternmatching/ScopedOptionFor.sc b/src/script/scala/progscala3/patternmatching/ScopedOptionFor.scala
similarity index 86%
rename from src/main/scala/progscala3/patternmatching/ScopedOptionFor.sc
rename to src/script/scala/progscala3/patternmatching/ScopedOptionFor.scala
index e80252ba..98f044d6 100644
--- a/src/main/scala/progscala3/patternmatching/ScopedOptionFor.sc
+++ b/src/script/scala/progscala3/patternmatching/ScopedOptionFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/ScopedOptionFor.sc
+// src/script/scala/progscala3/patternmatching/ScopedOptionFor.scala
 
 val dogBreeds = Seq(Some("Doberman"), None, Some("Yorkshire Terrier"), 
                     Some("Dachshund"), None, Some("Scottish Terrier"),
diff --git a/src/main/scala/progscala3/rounding/AssignedIf.sc b/src/script/scala/progscala3/rounding/AssignedIf.scala
similarity index 79%
rename from src/main/scala/progscala3/rounding/AssignedIf.sc
rename to src/script/scala/progscala3/rounding/AssignedIf.scala
index 8366f54a..fa21c145 100644
--- a/src/main/scala/progscala3/rounding/AssignedIf.sc
+++ b/src/script/scala/progscala3/rounding/AssignedIf.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/AssignedIf.sc
+// src/script/scala/progscala3/rounding/AssignedIf.scala
 
 val configFile = new java.io.File("somefile.txt")
 
diff --git a/src/main/scala/progscala3/rounding/BasicFor.sc b/src/script/scala/progscala3/rounding/BasicFor.scala
similarity index 59%
rename from src/main/scala/progscala3/rounding/BasicFor.sc
rename to src/script/scala/progscala3/rounding/BasicFor.scala
index 5b14672a..45df19c6 100644
--- a/src/main/scala/progscala3/rounding/BasicFor.sc
+++ b/src/script/scala/progscala3/rounding/BasicFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/BasicFor.sc
+// src/script/scala/progscala3/rounding/BasicFor.scala
 
 import progscala3.rounding.WeekDay
 
diff --git a/src/main/scala/progscala3/rounding/CallByName.sc b/src/script/scala/progscala3/rounding/CallByName.scala
similarity index 89%
rename from src/main/scala/progscala3/rounding/CallByName.sc
rename to src/script/scala/progscala3/rounding/CallByName.scala
index 705f6fdc..6070f111 100644
--- a/src/main/scala/progscala3/rounding/CallByName.sc
+++ b/src/script/scala/progscala3/rounding/CallByName.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/CallByName.sc
+// src/script/scala/progscala3/rounding/CallByName.scala
 
 @annotation.tailrec                                                  // <1>
 def continue(conditional: => Boolean)(body: => Unit): Unit = {       // <2>
diff --git a/src/main/scala/progscala3/rounding/DaysEnumeration.sc b/src/script/scala/progscala3/rounding/DaysEnumeration.scala
similarity index 91%
rename from src/main/scala/progscala3/rounding/DaysEnumeration.sc
rename to src/script/scala/progscala3/rounding/DaysEnumeration.scala
index f44eb019..8bc562d6 100644
--- a/src/main/scala/progscala3/rounding/DaysEnumeration.sc
+++ b/src/script/scala/progscala3/rounding/DaysEnumeration.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/DaysEnumeration.sc
+// src/script/scala/progscala3/rounding/DaysEnumeration.scala
 
 import progscala3.rounding.WeekDay
 import progscala3.rounding.WeekDay._
diff --git a/src/main/scala/progscala3/rounding/DoWhile.sc b/src/script/scala/progscala3/rounding/DoWhile.scala
similarity index 63%
rename from src/main/scala/progscala3/rounding/DoWhile.sc
rename to src/script/scala/progscala3/rounding/DoWhile.scala
index 269e4053..2d1ff9c3 100644
--- a/src/main/scala/progscala3/rounding/DoWhile.sc
+++ b/src/script/scala/progscala3/rounding/DoWhile.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/DoWhile.sc
+// src/script/scala/progscala3/rounding/DoWhile.scala
 
 var count = 0
 
diff --git a/src/main/scala/progscala3/rounding/DoubleGuardFor.sc b/src/script/scala/progscala3/rounding/DoubleGuardFor.scala
similarity index 81%
rename from src/main/scala/progscala3/rounding/DoubleGuardFor.sc
rename to src/script/scala/progscala3/rounding/DoubleGuardFor.scala
index fb437ac9..2a0a3872 100644
--- a/src/main/scala/progscala3/rounding/DoubleGuardFor.sc
+++ b/src/script/scala/progscala3/rounding/DoubleGuardFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/DoubleGuardFor.sc
+// src/script/scala/progscala3/rounding/DoubleGuardFor.scala
 
 import progscala3.rounding.WeekDay
 
diff --git a/src/script/scala/progscala3/rounding/Generator.scala b/src/script/scala/progscala3/rounding/Generator.scala
new file mode 100644
index 00000000..5da3dfd1
--- /dev/null
+++ b/src/script/scala/progscala3/rounding/Generator.scala
@@ -0,0 +1,3 @@
+// src/script/scala/progscala3/rounding/Generator.scala
+
+for (i <- 1 to 10) println(i)
diff --git a/src/main/scala/progscala3/rounding/If.sc b/src/script/scala/progscala3/rounding/If.scala
similarity index 83%
rename from src/main/scala/progscala3/rounding/If.sc
rename to src/script/scala/progscala3/rounding/If.scala
index fc9357ba..86d0e6bb 100644
--- a/src/main/scala/progscala3/rounding/If.sc
+++ b/src/script/scala/progscala3/rounding/If.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/If.sc
+// src/script/scala/progscala3/rounding/If.scala
 
 import progscala3.rounding.WeekDay
 
diff --git a/src/main/scala/progscala3/rounding/LazyInitVal.sc b/src/script/scala/progscala3/rounding/LazyInitVal.scala
similarity index 68%
rename from src/main/scala/progscala3/rounding/LazyInitVal.sc
rename to src/script/scala/progscala3/rounding/LazyInitVal.scala
index d2b44fa1..fb32ac45 100644
--- a/src/main/scala/progscala3/rounding/LazyInitVal.sc
+++ b/src/script/scala/progscala3/rounding/LazyInitVal.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/LazyInitVal.sc
+// src/script/scala/progscala3/rounding/LazyInitVal.scala
 
 object ExpensiveResource {
   lazy val resource: Int = init()  
diff --git a/src/main/scala/progscala3/rounding/NoDotBetter.sc b/src/script/scala/progscala3/rounding/NoDotBetter.scala
similarity index 58%
rename from src/main/scala/progscala3/rounding/NoDotBetter.sc
rename to src/script/scala/progscala3/rounding/NoDotBetter.scala
index 026aa8de..ad5238d0 100644
--- a/src/main/scala/progscala3/rounding/NoDotBetter.sc
+++ b/src/script/scala/progscala3/rounding/NoDotBetter.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/NoDotBetter.sc
+// src/script/scala/progscala3/rounding/NoDotBetter.scala
 
 def isEven(n: Int) = (n % 2) == 0
 
diff --git a/src/main/scala/progscala3/rounding/ScopedFor.sc b/src/script/scala/progscala3/rounding/ScopedFor.scala
similarity index 66%
rename from src/main/scala/progscala3/rounding/ScopedFor.sc
rename to src/script/scala/progscala3/rounding/ScopedFor.scala
index 923749b6..a123ff74 100644
--- a/src/main/scala/progscala3/rounding/ScopedFor.sc
+++ b/src/script/scala/progscala3/rounding/ScopedFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/ScopedFor.sc
+// src/script/scala/progscala3/rounding/ScopedFor.scala
 
 import progscala3.rounding.WeekDay
 
diff --git a/src/main/scala/progscala3/rounding/ScopedOptionFor.sc b/src/script/scala/progscala3/rounding/ScopedOptionFor.scala
similarity index 85%
rename from src/main/scala/progscala3/rounding/ScopedOptionFor.sc
rename to src/script/scala/progscala3/rounding/ScopedOptionFor.scala
index 3808a41d..7d02fe7d 100644
--- a/src/main/scala/progscala3/rounding/ScopedOptionFor.sc
+++ b/src/script/scala/progscala3/rounding/ScopedOptionFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/patternmatching/ScopedOptionFor.sc
+// src/script/scala/progscala3/patternmatching/ScopedOptionFor.scala
 
 import progscala3.rounding.WeekDay
 import progscala3.rounding.WeekDay._
diff --git a/src/main/scala/progscala3/rounding/Traits.sc b/src/script/scala/progscala3/rounding/Traits.scala
similarity index 95%
rename from src/main/scala/progscala3/rounding/Traits.sc
rename to src/script/scala/progscala3/rounding/Traits.scala
index 573a218d..a3f21a6b 100644
--- a/src/main/scala/progscala3/rounding/Traits.sc
+++ b/src/script/scala/progscala3/rounding/Traits.scala
@@ -1,5 +1,5 @@
 // BEGIN SERVICE
-// src/main/scala/progscala3/rounding/Traits.sc
+// src/script/scala/progscala3/rounding/Traits.scala
 
 class ServiceImportante(name: String) {
   def work(i: Int): Int = {
diff --git a/src/main/scala/progscala3/rounding/While.sc b/src/script/scala/progscala3/rounding/While.scala
similarity index 83%
rename from src/main/scala/progscala3/rounding/While.sc
rename to src/script/scala/progscala3/rounding/While.scala
index d2d08224..e3a8b71b 100644
--- a/src/main/scala/progscala3/rounding/While.sc
+++ b/src/script/scala/progscala3/rounding/While.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/While.sc
+// src/script/scala/progscala3/rounding/While.scala
 
 def isThirteen(i: Int): Boolean = {
   // Scala returns the result of the last expression in a method
diff --git a/src/main/scala/progscala3/rounding/YieldingFor.sc b/src/script/scala/progscala3/rounding/YieldingFor.scala
similarity index 79%
rename from src/main/scala/progscala3/rounding/YieldingFor.sc
rename to src/script/scala/progscala3/rounding/YieldingFor.scala
index 99541a4d..82fc2e1a 100644
--- a/src/main/scala/progscala3/rounding/YieldingFor.sc
+++ b/src/script/scala/progscala3/rounding/YieldingFor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/rounding/YieldingFor.sc
+// src/script/scala/progscala3/rounding/YieldingFor.scala
 
 import progscala3.rounding.WeekDay
 import progscala3.rounding.WeekDay._
diff --git a/src/main/scala/progscala3/toolslibs/Example.sc b/src/script/scala/progscala3/toolslibs/Example.scala
similarity index 71%
rename from src/main/scala/progscala3/toolslibs/Example.sc
rename to src/script/scala/progscala3/toolslibs/Example.scala
index bfcc38f1..fc1edcf7 100644
--- a/src/main/scala/progscala3/toolslibs/Example.sc
+++ b/src/script/scala/progscala3/toolslibs/Example.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/toolslibs/Example.sc
+// src/script/scala/progscala3/toolslibs/Example.scala
 
 case class Message(name: String)
 
diff --git a/src/main/scala/progscala3/traits/TraitConstruction.sc b/src/script/scala/progscala3/traits/TraitConstruction.scala
similarity index 92%
rename from src/main/scala/progscala3/traits/TraitConstruction.sc
rename to src/script/scala/progscala3/traits/TraitConstruction.scala
index 9be69334..f087f866 100644
--- a/src/main/scala/progscala3/traits/TraitConstruction.sc
+++ b/src/script/scala/progscala3/traits/TraitConstruction.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/traits/TraitConstruction.sc
+// src/script/scala/progscala3/traits/TraitConstruction.scala
 
 trait T1 {
   // The following would cause: "uninitialized value"
diff --git a/src/main/scala/progscala3/traits/ui/ButtonCountObserver.sc b/src/script/scala/progscala3/traits/ui/ButtonCountObserver.scala
similarity index 87%
rename from src/main/scala/progscala3/traits/ui/ButtonCountObserver.sc
rename to src/script/scala/progscala3/traits/ui/ButtonCountObserver.scala
index c136acdb..d61756f9 100644
--- a/src/main/scala/progscala3/traits/ui/ButtonCountObserver.sc
+++ b/src/script/scala/progscala3/traits/ui/ButtonCountObserver.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/traits/ui/ButtonCountObserver.sc
+// src/script/scala/progscala3/traits/ui/ButtonCountObserver.scala
 import progscala3.traits.ui._
 import progscala3.traits.observer._
 
diff --git a/src/main/scala/progscala3/traits/ui/ButtonCountObserver2.sc b/src/script/scala/progscala3/traits/ui/ButtonCountObserver2.scala
similarity index 89%
rename from src/main/scala/progscala3/traits/ui/ButtonCountObserver2.sc
rename to src/script/scala/progscala3/traits/ui/ButtonCountObserver2.scala
index 0a37c77d..70c3eb8f 100644
--- a/src/main/scala/progscala3/traits/ui/ButtonCountObserver2.sc
+++ b/src/script/scala/progscala3/traits/ui/ButtonCountObserver2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/traits/ui/ButtonCountObserver2.sc
+// src/script/scala/progscala3/traits/ui/ButtonCountObserver2.scala
 import progscala3.traits.ui._
 import progscala3.traits.observer._
 
diff --git a/src/main/scala/progscala3/traits/ui2/ClickCountObserver.sc b/src/script/scala/progscala3/traits/ui2/ClickCountObserver.scala
similarity index 89%
rename from src/main/scala/progscala3/traits/ui2/ClickCountObserver.sc
rename to src/script/scala/progscala3/traits/ui2/ClickCountObserver.scala
index 230e5e47..aafacad7 100644
--- a/src/main/scala/progscala3/traits/ui2/ClickCountObserver.sc
+++ b/src/script/scala/progscala3/traits/ui2/ClickCountObserver.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/traits/ui2/ClickCountObserver.sc
+// src/script/scala/progscala3/traits/ui2/ClickCountObserver.scala
 import progscala3.traits.ui2._
 import progscala3.traits.observer._
 
diff --git a/src/main/scala/progscala3/traits/ui2/VetoableClickCountObserver.sc b/src/script/scala/progscala3/traits/ui2/VetoableClickCountObserver.scala
similarity index 90%
rename from src/main/scala/progscala3/traits/ui2/VetoableClickCountObserver.sc
rename to src/script/scala/progscala3/traits/ui2/VetoableClickCountObserver.scala
index 5d505367..5036ecf8 100644
--- a/src/main/scala/progscala3/traits/ui2/VetoableClickCountObserver.sc
+++ b/src/script/scala/progscala3/traits/ui2/VetoableClickCountObserver.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/traits/ui2/VetoableClickCountObserver.sc
+// src/script/scala/progscala3/traits/ui2/VetoableClickCountObserver.scala
 import progscala3.traits.ui2._
 import progscala3.traits.observer._
 
diff --git a/src/main/scala/progscala3/typelessdomore/AbstractTypes.sc b/src/script/scala/progscala3/typelessdomore/AbstractTypes.scala
similarity index 81%
rename from src/main/scala/progscala3/typelessdomore/AbstractTypes.sc
rename to src/script/scala/progscala3/typelessdomore/AbstractTypes.scala
index 60c2f3ae..dccccc44 100644
--- a/src/main/scala/progscala3/typelessdomore/AbstractTypes.sc
+++ b/src/script/scala/progscala3/typelessdomore/AbstractTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/AbstractTypes.sc
+// src/script/scala/progscala3/typelessdomore/AbstractTypes.scala
 import java.io._
 
 abstract class BulkReader {
@@ -26,4 +26,4 @@ class FileBulkReader(val source: File) extends BulkReader {
 println(new StringBulkReader("Hello Scala!").read)
 // Assumes the current directory is the project root:
 println(new FileBulkReader(
-  new File("src/main/scala/progscala3/typelessdomore/AbstractTypes.sc")).read)
+  new File("src/script/scala/progscala3/typelessdomore/AbstractTypes.scala")).read)
diff --git a/src/main/scala/progscala3/typelessdomore/Factorial.sc b/src/script/scala/progscala3/typelessdomore/Factorial.scala
similarity index 77%
rename from src/main/scala/progscala3/typelessdomore/Factorial.sc
rename to src/script/scala/progscala3/typelessdomore/Factorial.scala
index 87e0e823..97bf4dd6 100644
--- a/src/main/scala/progscala3/typelessdomore/Factorial.sc
+++ b/src/script/scala/progscala3/typelessdomore/Factorial.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/Factorial.sc
+// src/script/scala/progscala3/typelessdomore/Factorial.scala
 
 def factorial(i: Int): Long = {
   def fact(i: Int, accumulator: Long): Long = {
diff --git a/src/main/scala/progscala3/typelessdomore/FactorialTailrec.sc b/src/script/scala/progscala3/typelessdomore/FactorialTailrec.scala
similarity index 78%
rename from src/main/scala/progscala3/typelessdomore/FactorialTailrec.sc
rename to src/script/scala/progscala3/typelessdomore/FactorialTailrec.scala
index deb19dd7..223999a1 100644
--- a/src/main/scala/progscala3/typelessdomore/FactorialTailrec.sc
+++ b/src/script/scala/progscala3/typelessdomore/FactorialTailrec.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/FactorialTailrec.sc
+// src/script/scala/progscala3/typelessdomore/FactorialTailrec.scala
 import scala.annotation.tailrec
 
 def factorial(i: Int): Long = {
diff --git a/src/main/scala/progscala3/typelessdomore/FibonacciTailrec.sc b/src/script/scala/progscala3/typelessdomore/FibonacciTailrec.scala
similarity index 72%
rename from src/main/scala/progscala3/typelessdomore/FibonacciTailrec.sc
rename to src/script/scala/progscala3/typelessdomore/FibonacciTailrec.scala
index 908352c7..a8f9ebab 100644
--- a/src/main/scala/progscala3/typelessdomore/FibonacciTailrec.sc
+++ b/src/script/scala/progscala3/typelessdomore/FibonacciTailrec.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/FibonacciTailrec.sc
+// src/script/scala/progscala3/typelessdomore/FibonacciTailrec.scala
 import scala.annotation.tailrec
 
 @tailrec
diff --git a/src/main/scala/progscala3/typelessdomore/Futures.sc b/src/script/scala/progscala3/typelessdomore/Futures.scala
similarity index 92%
rename from src/main/scala/progscala3/typelessdomore/Futures.sc
rename to src/script/scala/progscala3/typelessdomore/Futures.scala
index 5decd208..402cd9bd 100644
--- a/src/main/scala/progscala3/typelessdomore/Futures.sc
+++ b/src/script/scala/progscala3/typelessdomore/Futures.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/Futures.sc
+// src/script/scala/progscala3/typelessdomore/Futures.scala
 import scala.concurrent.Future
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.util.{Failure, Success}
diff --git a/src/main/scala/progscala3/typelessdomore/ImplicitStrings.sc b/src/script/scala/progscala3/typelessdomore/ImplicitStrings.scala
similarity index 54%
rename from src/main/scala/progscala3/typelessdomore/ImplicitStrings.sc
rename to src/script/scala/progscala3/typelessdomore/ImplicitStrings.scala
index 027d8eb3..4665d672 100644
--- a/src/main/scala/progscala3/typelessdomore/ImplicitStrings.sc
+++ b/src/script/scala/progscala3/typelessdomore/ImplicitStrings.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/ImplicitStrings.sc
+// src/script/scala/progscala3/typelessdomore/ImplicitStrings.scala
 
 val s = "Programming Scala"
 s.reverse
diff --git a/src/main/scala/progscala3/typelessdomore/Loop.sc b/src/script/scala/progscala3/typelessdomore/Loop.scala
similarity index 83%
rename from src/main/scala/progscala3/typelessdomore/Loop.sc
rename to src/script/scala/progscala3/typelessdomore/Loop.scala
index aa324f65..1dcf1f08 100644
--- a/src/main/scala/progscala3/typelessdomore/Loop.sc
+++ b/src/script/scala/progscala3/typelessdomore/Loop.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/Loop.sc
+// src/script/scala/progscala3/typelessdomore/Loop.scala
 
 /** Do "pure side effect" work */
 def loop(n: Int)(f: Int => Unit): Unit = {
diff --git a/src/main/scala/progscala3/typelessdomore/MapGet.sc b/src/script/scala/progscala3/typelessdomore/MapGet.scala
similarity index 93%
rename from src/main/scala/progscala3/typelessdomore/MapGet.sc
rename to src/script/scala/progscala3/typelessdomore/MapGet.scala
index 9d50ca13..344081f1 100644
--- a/src/main/scala/progscala3/typelessdomore/MapGet.sc
+++ b/src/script/scala/progscala3/typelessdomore/MapGet.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MapGet.sc
+// src/script/scala/progscala3/typelessdomore/MapGet.scala
 // Very limited version of a map; it can hold only one key-value
 // pair! The "get" method is used in the text, by itself...
 
diff --git a/src/main/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.sc b/src/script/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.scala
similarity index 75%
rename from src/main/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.sc
rename to src/script/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.scala
index 6f5913e6..24ed302e 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.sc
+// src/script/scala/progscala3/typelessdomore/MethodBroadInferenceReturn.scala
 // ERROR: Won't compile. Method actually returns List[Any]; too "broad".
 
 def makeList(strings: String*) = {
diff --git a/src/main/scala/progscala3/typelessdomore/MethodNestedReturn.sc b/src/script/scala/progscala3/typelessdomore/MethodNestedReturn.scala
similarity index 76%
rename from src/main/scala/progscala3/typelessdomore/MethodNestedReturn.sc
rename to src/script/scala/progscala3/typelessdomore/MethodNestedReturn.scala
index a8e798e9..d423a261 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodNestedReturn.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodNestedReturn.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodNestedReturn.sc
+// src/script/scala/progscala3/typelessdomore/MethodNestedReturn.scala
 // ERROR: Won't compile until you put a String return type on upCase.
 
 def upCase(s: String) = {
diff --git a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.sc b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.scala
similarity index 80%
rename from src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.sc
rename to src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.scala
index 80d40fb6..1e8a63ce 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.sc
+// src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV1.scala
 // Version 1 of "StringUtil" (with a compilation error).
 // ERROR: Won't compile: needs a String return type on the second "joiner".
 
diff --git a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.sc b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.scala
similarity index 83%
rename from src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.sc
rename to src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.scala
index 0604df6f..3c9e3860 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.sc
+// src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV2.scala
 // Version 2 of "StringUtil" (with a fixed compilation error).
 
 object StringUtilV2 {
diff --git a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.sc b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.scala
similarity index 87%
rename from src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.sc
rename to src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.scala
index 1e3219f5..8337cfcc 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.sc
+// src/script/scala/progscala3/typelessdomore/MethodOverloadedReturnV3.scala
 // Version 3 of "StringUtil" (New variable argument list methods).
 
 object StringUtilV3 {
diff --git a/src/main/scala/progscala3/typelessdomore/MethodRecursiveReturn.sc b/src/script/scala/progscala3/typelessdomore/MethodRecursiveReturn.scala
similarity index 80%
rename from src/main/scala/progscala3/typelessdomore/MethodRecursiveReturn.sc
rename to src/script/scala/progscala3/typelessdomore/MethodRecursiveReturn.scala
index ade5ff0d..2955dbc5 100644
--- a/src/main/scala/progscala3/typelessdomore/MethodRecursiveReturn.sc
+++ b/src/script/scala/progscala3/typelessdomore/MethodRecursiveReturn.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MethodRecursiveReturn.sc
+// src/script/scala/progscala3/typelessdomore/MethodRecursiveReturn.scala
 // ERROR: Won't compile until you put an Int return type on "fact".
 import scala.annotation.tailrec
 
diff --git a/src/main/scala/progscala3/typelessdomore/MultilineStrings.sc b/src/script/scala/progscala3/typelessdomore/MultilineStrings.scala
similarity index 72%
rename from src/main/scala/progscala3/typelessdomore/MultilineStrings.sc
rename to src/script/scala/progscala3/typelessdomore/MultilineStrings.scala
index 72b66057..537ec846 100644
--- a/src/main/scala/progscala3/typelessdomore/MultilineStrings.sc
+++ b/src/script/scala/progscala3/typelessdomore/MultilineStrings.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MultilineStrings.sc
+// src/script/scala/progscala3/typelessdomore/MultilineStrings.scala
 
 def hello(name: String) = s"""Welcome!
   Hello, $name!
diff --git a/src/main/scala/progscala3/typelessdomore/MultilineStrings2.sc b/src/script/scala/progscala3/typelessdomore/MultilineStrings2.scala
similarity index 68%
rename from src/main/scala/progscala3/typelessdomore/MultilineStrings2.sc
rename to src/script/scala/progscala3/typelessdomore/MultilineStrings2.scala
index c8b2f415..e284180b 100644
--- a/src/main/scala/progscala3/typelessdomore/MultilineStrings2.sc
+++ b/src/script/scala/progscala3/typelessdomore/MultilineStrings2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/MultilineStrings2.sc
+// src/script/scala/progscala3/typelessdomore/MultilineStrings2.scala
 
 def goodbye(name: String) = 
   s"""xxxGoodbye, ${name}yyy
diff --git a/src/main/scala/progscala3/typelessdomore/ParameterizedTypes.sc b/src/script/scala/progscala3/typelessdomore/ParameterizedTypes.scala
similarity index 81%
rename from src/main/scala/progscala3/typelessdomore/ParameterizedTypes.sc
rename to src/script/scala/progscala3/typelessdomore/ParameterizedTypes.scala
index a7b7b057..c25bebe4 100644
--- a/src/main/scala/progscala3/typelessdomore/ParameterizedTypes.sc
+++ b/src/script/scala/progscala3/typelessdomore/ParameterizedTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/ParameterizedTypes.sc
+// src/script/scala/progscala3/typelessdomore/ParameterizedTypes.scala
 import java.io._
 
 abstract class BulkReader[In] {
@@ -24,6 +24,6 @@ val sbb = new StringBulkReader("Hello Scala!")
 println(sbb.read)
 
 // Assumes the current directory is the project root:
-val path = "src/main/scala/progscala3/typelessdomore/ParameterizedTypes.sc"
+val path = "src/script/scala/progscala3/typelessdomore/ParameterizedTypes.scala"
 val fbb = new FileBulkReader(new File(path))
 println(fbb.read)
diff --git a/src/main/scala/progscala3/typelessdomore/PartialFunctions.sc b/src/script/scala/progscala3/typelessdomore/PartialFunctions.scala
similarity index 94%
rename from src/main/scala/progscala3/typelessdomore/PartialFunctions.sc
rename to src/script/scala/progscala3/typelessdomore/PartialFunctions.scala
index c6ba953a..2e44a594 100644
--- a/src/main/scala/progscala3/typelessdomore/PartialFunctions.sc
+++ b/src/script/scala/progscala3/typelessdomore/PartialFunctions.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/PartialFunctions.sc
+// src/script/scala/progscala3/typelessdomore/PartialFunctions.scala
 
 val pfs: PartialFunction[Any,String] = { case s:String => "YES" }    // <1>
 val pfd: PartialFunction[Any,String] = { case d:Double => "YES" }    // <2>
diff --git a/src/main/scala/progscala3/typelessdomore/Person.sc b/src/script/scala/progscala3/typelessdomore/Person.scala
similarity index 71%
rename from src/main/scala/progscala3/typelessdomore/Person.sc
rename to src/script/scala/progscala3/typelessdomore/Person.scala
index 875315da..4e52c8bd 100644
--- a/src/main/scala/progscala3/typelessdomore/Person.sc
+++ b/src/script/scala/progscala3/typelessdomore/Person.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/Person.sc
+// src/script/scala/progscala3/typelessdomore/Person.scala
 
 class Person(val name: String, var age: Int)
 
diff --git a/src/main/scala/progscala3/typelessdomore/Ranges.sc b/src/script/scala/progscala3/typelessdomore/Ranges.scala
similarity index 86%
rename from src/main/scala/progscala3/typelessdomore/Ranges.sc
rename to src/script/scala/progscala3/typelessdomore/Ranges.scala
index 18aaa11d..e7ef0bc1 100644
--- a/src/main/scala/progscala3/typelessdomore/Ranges.sc
+++ b/src/script/scala/progscala3/typelessdomore/Ranges.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/Ranges.sc
+// src/script/scala/progscala3/typelessdomore/Ranges.scala
 
 1 to 10                   // Int range inclusive, interval of 1, (1 to 10)
 
diff --git a/src/main/scala/progscala3/typelessdomore/SemicolonExample.sc b/src/script/scala/progscala3/typelessdomore/SemicolonExample.scala
similarity index 86%
rename from src/main/scala/progscala3/typelessdomore/SemicolonExample.sc
rename to src/script/scala/progscala3/typelessdomore/SemicolonExample.scala
index cb3cecb3..d852cbdd 100644
--- a/src/main/scala/progscala3/typelessdomore/SemicolonExample.sc
+++ b/src/script/scala/progscala3/typelessdomore/SemicolonExample.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/semicolon-example.sc
+// src/script/scala/progscala3/typelessdomore/semicolon-example.sc
 
 // Trailing equals sign indicates more code on the next line.
 def equalsign(s: String) =
diff --git a/src/main/scala/progscala3/typelessdomore/StateCapitalsSubset.sc b/src/script/scala/progscala3/typelessdomore/StateCapitalsSubset.scala
similarity index 86%
rename from src/main/scala/progscala3/typelessdomore/StateCapitalsSubset.sc
rename to src/script/scala/progscala3/typelessdomore/StateCapitalsSubset.scala
index c732b7e7..a08ec251 100644
--- a/src/main/scala/progscala3/typelessdomore/StateCapitalsSubset.sc
+++ b/src/script/scala/progscala3/typelessdomore/StateCapitalsSubset.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/StateCapitalsSubset.sc
+// src/script/scala/progscala3/typelessdomore/StateCapitalsSubset.scala
 
 val stateCapitals = Map(
   "Alabama" -> "Montgomery",
diff --git a/src/main/scala/progscala3/typelessdomore/TupleExample.sc b/src/script/scala/progscala3/typelessdomore/TupleExample.scala
similarity index 88%
rename from src/main/scala/progscala3/typelessdomore/TupleExample.sc
rename to src/script/scala/progscala3/typelessdomore/TupleExample.scala
index d6c99d4a..c5941fb1 100644
--- a/src/main/scala/progscala3/typelessdomore/TupleExample.sc
+++ b/src/script/scala/progscala3/typelessdomore/TupleExample.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typelessdomore/TupleExample.sc
+// src/script/scala/progscala3/typelessdomore/TupleExample.scala
 
 val t = ("Hello", 1, 2.3)                                            // <1>
 println("Print the whole tuple: " + t)   
diff --git a/src/main/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.sc b/src/script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala
similarity index 94%
rename from src/main/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.sc
rename to src/script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala
index a2901a62..a22c2a71 100644
--- a/src/main/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.sc
+++ b/src/script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.sc
+// src/script/scala/progscala3/typesystem/abstracttypes/AbstractTypesEx.scala
 
 trait exampleTrait {
   type t1               // t1 is unconstrained
diff --git a/src/main/scala/progscala3/typesystem/bounds/LowerBounds.sc b/src/script/scala/progscala3/typesystem/bounds/LowerBounds.scala
similarity index 92%
rename from src/main/scala/progscala3/typesystem/bounds/LowerBounds.sc
rename to src/script/scala/progscala3/typesystem/bounds/LowerBounds.scala
index b7ab6a77..49c231b0 100644
--- a/src/main/scala/progscala3/typesystem/bounds/LowerBounds.sc
+++ b/src/script/scala/progscala3/typesystem/bounds/LowerBounds.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/bounds/LowerBounds.sc
+// src/script/scala/progscala3/typesystem/bounds/LowerBounds.scala
 
 class Parent(val value: Int) {                   // <1>
   override def toString = s"${this.getClass.getName}($value)" 
diff --git a/src/main/scala/progscala3/typesystem/bounds/LowerBounds2.sc b/src/script/scala/progscala3/typesystem/bounds/LowerBounds2.scala
similarity index 92%
rename from src/main/scala/progscala3/typesystem/bounds/LowerBounds2.sc
rename to src/script/scala/progscala3/typesystem/bounds/LowerBounds2.scala
index 2465bfff..a78b008d 100644
--- a/src/main/scala/progscala3/typesystem/bounds/LowerBounds2.sc
+++ b/src/script/scala/progscala3/typesystem/bounds/LowerBounds2.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/bounds/lower-bounds2.sc
+// src/script/scala/progscala3/typesystem/bounds/lower-bounds2.sc
 
 // Won't compile, because if +A is used, then "default" in +getOrElse+
 // must be a of type B, where B >: A.
diff --git a/src/main/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.sc b/src/script/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.scala
similarity index 92%
rename from src/main/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.sc
rename to src/script/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.scala
index 7994cbb7..c2990a9d 100644
--- a/src/main/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.sc
+++ b/src/script/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.sc
+// src/script/scala/progscala3/typesystem/bounds/ViewBoundsDeprecated.scala
 import scala.language.implicitConversions
 
 object Serialization {
diff --git a/src/main/scala/progscala3/typesystem/bounds/ViewToContextBounds.sc b/src/script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala
similarity index 92%
rename from src/main/scala/progscala3/typesystem/bounds/ViewToContextBounds.sc
rename to src/script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala
index 7e1ef994..9e7911de 100644
--- a/src/main/scala/progscala3/typesystem/bounds/ViewToContextBounds.sc
+++ b/src/script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/bounds/ViewToContextBounds.sc
+// src/script/scala/progscala3/typesystem/bounds/ViewToContextBounds.scala
 // Need the following unless -language.implicitConversions option is used.
 // import scala.language.implicitConversions
 
diff --git a/src/main/scala/progscala3/typesystem/bounds/list/ListAb.sc b/src/script/scala/progscala3/typesystem/bounds/list/ListAb.scala
similarity index 87%
rename from src/main/scala/progscala3/typesystem/bounds/list/ListAb.sc
rename to src/script/scala/progscala3/typesystem/bounds/list/ListAb.scala
index 5d7cee58..c88fd3f2 100644
--- a/src/main/scala/progscala3/typesystem/bounds/list/ListAb.sc
+++ b/src/script/scala/progscala3/typesystem/bounds/list/ListAb.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/bounds/list/ListAb.sc
+// src/script/scala/progscala3/typesystem/bounds/list/ListAb.scala
 import progscala3.typesystem.bounds.list._
 
 //val languages = AbbrevList("Scala", "Java", "Ruby", "C#", "C++", "Python")
diff --git a/src/main/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.sc b/src/script/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.scala
similarity index 89%
rename from src/main/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.sc
rename to src/script/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.scala
index b2a9ade4..c51f55fd 100644
--- a/src/main/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.sc
+++ b/src/script/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.sc
+// src/script/scala/progscala3/typesystem/dependentmethodtypes/DepMethod.scala
 sealed trait Sumable {
   type Element
   def sum: Element
diff --git a/src/main/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.sc b/src/script/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.scala
similarity index 79%
rename from src/main/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.sc
rename to src/script/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.scala
index f9b4f216..3aa0fae4 100644
--- a/src/main/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.sc
+++ b/src/script/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.sc
+// src/script/scala/progscala3/typesystem/existentials/TypeErasureWorkaround.scala
 
 object Doubler {
   def double(seq: Seq[_]): Seq[Int] = seq match {
diff --git a/src/main/scala/progscala3/typesystem/higherkinded/Add.sc b/src/script/scala/progscala3/typesystem/higherkinded/Add.scala
similarity index 91%
rename from src/main/scala/progscala3/typesystem/higherkinded/Add.sc
rename to src/script/scala/progscala3/typesystem/higherkinded/Add.scala
index 6e692e28..8c20779f 100644
--- a/src/main/scala/progscala3/typesystem/higherkinded/Add.sc
+++ b/src/script/scala/progscala3/typesystem/higherkinded/Add.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/higherkinded/Add.sc
+// src/script/scala/progscala3/typesystem/higherkinded/Add.scala
 // Add the following line if you don't use the compiler option
 // "-language:higherKinds"
 // import scala.language.higherKinds
diff --git a/src/main/scala/progscala3/typesystem/higherkinded/AddSeq.sc b/src/script/scala/progscala3/typesystem/higherkinded/AddSeq.scala
similarity index 83%
rename from src/main/scala/progscala3/typesystem/higherkinded/AddSeq.sc
rename to src/script/scala/progscala3/typesystem/higherkinded/AddSeq.scala
index 0cd8a5c6..f6be9ad9 100644
--- a/src/main/scala/progscala3/typesystem/higherkinded/AddSeq.sc
+++ b/src/script/scala/progscala3/typesystem/higherkinded/AddSeq.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/higherkinded/AddSeq.sc
+// src/script/scala/progscala3/typesystem/higherkinded/AddSeq.scala
 import progscala3.typesystem.higherkinded.Add              // <1>
 import progscala3.typesystem.higherkinded.Add._
 
diff --git a/src/main/scala/progscala3/typesystem/higherkinded/Sum.sc b/src/script/scala/progscala3/typesystem/higherkinded/Sum.scala
similarity index 90%
rename from src/main/scala/progscala3/typesystem/higherkinded/Sum.sc
rename to src/script/scala/progscala3/typesystem/higherkinded/Sum.scala
index 1fe9197c..bdc1d56e 100644
--- a/src/main/scala/progscala3/typesystem/higherkinded/Sum.sc
+++ b/src/script/scala/progscala3/typesystem/higherkinded/Sum.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/higherkinded/Sum.sc
+// src/script/scala/progscala3/typesystem/higherkinded/Sum.scala
 // Add the following line if you don't use the compiler option
 // "-language:higherKinds"
 // import scala.language.higherKinds
diff --git a/src/main/scala/progscala3/typesystem/lazy/LazyFibonacci.sc b/src/script/scala/progscala3/typesystem/lazy/LazyFibonacci.scala
similarity index 73%
rename from src/main/scala/progscala3/typesystem/lazy/LazyFibonacci.sc
rename to src/script/scala/progscala3/typesystem/lazy/LazyFibonacci.scala
index b3436a9f..78a80872 100644
--- a/src/main/scala/progscala3/typesystem/lazy/LazyFibonacci.sc
+++ b/src/script/scala/progscala3/typesystem/lazy/LazyFibonacci.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/lazy/LazyFibonacci.sc
+// src/script/scala/progscala3/typesystem/lazy/LazyFibonacci.scala
 
 lazy val fib: LazyList[Int] = 
   LazyList.cons(0, LazyList.cons(1, fib.zip(fib.tail).map(p => p._1 + p._2)))
diff --git a/src/main/scala/progscala3/typesystem/lazy/LazyInts.sc b/src/script/scala/progscala3/typesystem/lazy/LazyInts.scala
similarity index 83%
rename from src/main/scala/progscala3/typesystem/lazy/LazyInts.sc
rename to src/script/scala/progscala3/typesystem/lazy/LazyInts.scala
index 0b53dfd4..10a29b21 100644
--- a/src/main/scala/progscala3/typesystem/lazy/LazyInts.sc
+++ b/src/script/scala/progscala3/typesystem/lazy/LazyInts.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/lazy/LazyInts.sc
+// src/script/scala/progscala3/typesystem/lazy/LazyInts.scala
 
 def from(n: Int): LazyList[Int] = LazyList.cons(n, from(n+1))
 
diff --git a/src/main/scala/progscala3/typesystem/recursivetypes/FBound.sc b/src/script/scala/progscala3/typesystem/recursivetypes/FBound.scala
similarity index 93%
rename from src/main/scala/progscala3/typesystem/recursivetypes/FBound.sc
rename to src/script/scala/progscala3/typesystem/recursivetypes/FBound.scala
index 24a5deea..71bdde52 100644
--- a/src/main/scala/progscala3/typesystem/recursivetypes/FBound.sc
+++ b/src/script/scala/progscala3/typesystem/recursivetypes/FBound.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/recursivetypes/FBound.sc
+// src/script/scala/progscala3/typesystem/recursivetypes/FBound.scala
 
 trait Parent[T <: Parent[T]] {                                       // <1>
   def make: T 
diff --git a/src/main/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.sc b/src/script/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.scala
similarity index 82%
rename from src/main/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.sc
rename to src/script/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.scala
index 44abfbcb..a247a2d0 100644
--- a/src/main/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.sc
+++ b/src/script/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.sc
+// src/script/scala/progscala3/typesystem/selftype/ButtonSubjectObserver.scala
 import progscala3.typesystem.selftype._
 import ButtonSubjectObserver._
 
diff --git a/src/main/scala/progscala3/typesystem/selftype/SelftypeCakePattern.sc b/src/script/scala/progscala3/typesystem/selftype/SelftypeCakePattern.scala
similarity index 92%
rename from src/main/scala/progscala3/typesystem/selftype/SelftypeCakePattern.sc
rename to src/script/scala/progscala3/typesystem/selftype/SelftypeCakePattern.scala
index 17edc254..c8960d37 100644
--- a/src/main/scala/progscala3/typesystem/selftype/SelftypeCakePattern.sc
+++ b/src/script/scala/progscala3/typesystem/selftype/SelftypeCakePattern.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/selftype/selftype-cake-pattern.sc
+// src/script/scala/progscala3/typesystem/selftype/selftype-cake-pattern.sc
 
 trait Persistence { def startPersistence(): String }                 // <1>
 trait Midtier { def startMidtier(): String }
diff --git a/src/main/scala/progscala3/typesystem/selftype/ThisAlias.sc b/src/script/scala/progscala3/typesystem/selftype/ThisAlias.scala
similarity index 87%
rename from src/main/scala/progscala3/typesystem/selftype/ThisAlias.sc
rename to src/script/scala/progscala3/typesystem/selftype/ThisAlias.scala
index 780ab0bf..f34990e0 100644
--- a/src/main/scala/progscala3/typesystem/selftype/ThisAlias.sc
+++ b/src/script/scala/progscala3/typesystem/selftype/ThisAlias.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/selftype/ThisAlias.sc
+// src/script/scala/progscala3/typesystem/selftype/ThisAlias.scala
 
 class C1 { self =>                                                   // <1>
   def talk(message: String): String = "C1.talk: " + message
diff --git a/src/main/scala/progscala3/typesystem/structuraltypes/Observer.sc b/src/script/scala/progscala3/typesystem/structuraltypes/Observer.scala
similarity index 91%
rename from src/main/scala/progscala3/typesystem/structuraltypes/Observer.sc
rename to src/script/scala/progscala3/typesystem/structuraltypes/Observer.scala
index 57c78293..d86249c1 100644
--- a/src/main/scala/progscala3/typesystem/structuraltypes/Observer.sc
+++ b/src/script/scala/progscala3/typesystem/structuraltypes/Observer.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/structuraltypes/Observer.sc
+// src/script/scala/progscala3/typesystem/structuraltypes/Observer.scala
 import progscala3.typesystem.structuraltypes.Subject
 import scala.language.reflectiveCalls
 
diff --git a/src/main/scala/progscala3/typesystem/structuraltypes/ObserverFunc.sc b/src/script/scala/progscala3/typesystem/structuraltypes/ObserverFunc.scala
similarity index 89%
rename from src/main/scala/progscala3/typesystem/structuraltypes/ObserverFunc.sc
rename to src/script/scala/progscala3/typesystem/structuraltypes/ObserverFunc.scala
index dbe8fd12..68338b44 100644
--- a/src/main/scala/progscala3/typesystem/structuraltypes/ObserverFunc.sc
+++ b/src/script/scala/progscala3/typesystem/structuraltypes/ObserverFunc.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/structuraltypes/ObserverFunc.sc
+// src/script/scala/progscala3/typesystem/structuraltypes/ObserverFunc.scala
 import progscala3.typesystem.structuraltypes.SubjectFunc
 
 def makeObserverFunc(id: Int): Int => String = 
diff --git a/src/main/scala/progscala3/typesystem/typelambdas/Functor.sc b/src/script/scala/progscala3/typesystem/typelambdas/Functor.scala
similarity index 85%
rename from src/main/scala/progscala3/typesystem/typelambdas/Functor.sc
rename to src/script/scala/progscala3/typesystem/typelambdas/Functor.scala
index 5d863af1..07fea5da 100644
--- a/src/main/scala/progscala3/typesystem/typelambdas/Functor.sc
+++ b/src/script/scala/progscala3/typesystem/typelambdas/Functor.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/typelambdas/Functor.sc
+// src/script/scala/progscala3/typesystem/typelambdas/Functor.scala
 // Add the following line if you don't use the compiler option
 // "-language:higherKinds"
 // import scala.language.higherKinds
diff --git a/src/main/scala/progscala3/typesystem/valuetypes/CurriedFunction.sc b/src/script/scala/progscala3/typesystem/valuetypes/CurriedFunction.scala
similarity index 83%
rename from src/main/scala/progscala3/typesystem/valuetypes/CurriedFunction.sc
rename to src/script/scala/progscala3/typesystem/valuetypes/CurriedFunction.scala
index a98b3cf4..bb515aa1 100644
--- a/src/main/scala/progscala3/typesystem/valuetypes/CurriedFunction.sc
+++ b/src/script/scala/progscala3/typesystem/valuetypes/CurriedFunction.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/valuetypes/CurriedFunction.sc
+// src/script/scala/progscala3/typesystem/valuetypes/CurriedFunction.scala
 
 val f  = (x: Double, y: Double, z: Double) => x * y / z
 val fc = f.curried
diff --git a/src/main/scala/progscala3/typesystem/valuetypes/InfixTypes.sc b/src/script/scala/progscala3/typesystem/valuetypes/InfixTypes.scala
similarity index 88%
rename from src/main/scala/progscala3/typesystem/valuetypes/InfixTypes.sc
rename to src/script/scala/progscala3/typesystem/valuetypes/InfixTypes.scala
index 414801fe..598fb4d8 100644
--- a/src/main/scala/progscala3/typesystem/valuetypes/InfixTypes.sc
+++ b/src/script/scala/progscala3/typesystem/valuetypes/InfixTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/valuetypes/InfixTypes.sc
+// src/script/scala/progscala3/typesystem/valuetypes/InfixTypes.scala
 
 val xll1:  Int Either Double  Either String  = Left(Left(1))
 val xll2: (Int Either Double) Either String  = Left(Left(1))
diff --git a/src/main/scala/progscala3/typesystem/valuetypes/ObjectTypes.sc b/src/script/scala/progscala3/typesystem/valuetypes/ObjectTypes.scala
similarity index 81%
rename from src/main/scala/progscala3/typesystem/valuetypes/ObjectTypes.sc
rename to src/script/scala/progscala3/typesystem/valuetypes/ObjectTypes.scala
index dcb27e44..15509f0d 100644
--- a/src/main/scala/progscala3/typesystem/valuetypes/ObjectTypes.sc
+++ b/src/script/scala/progscala3/typesystem/valuetypes/ObjectTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/valuetypes/ObjectTypes.sc
+// src/script/scala/progscala3/typesystem/valuetypes/ObjectTypes.scala
 
 case object Foo { override def toString = "Foo says Hello!" }
 
diff --git a/src/main/scala/progscala3/typesystem/valuetypes/TypeProjection.sc b/src/script/scala/progscala3/typesystem/valuetypes/TypeProjection.scala
similarity index 81%
rename from src/main/scala/progscala3/typesystem/valuetypes/TypeProjection.sc
rename to src/script/scala/progscala3/typesystem/valuetypes/TypeProjection.scala
index 1bc52dab..7ec19518 100644
--- a/src/main/scala/progscala3/typesystem/valuetypes/TypeProjection.sc
+++ b/src/script/scala/progscala3/typesystem/valuetypes/TypeProjection.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/valuetypes/TypeProjection.sc
+// src/script/scala/progscala3/typesystem/valuetypes/TypeProjection.scala
 import progscala3.typesystem.valuetypes._
 
 val l1: Service.Log   = new ConsoleLogger    // ERROR: No Service "value"
diff --git a/src/main/scala/progscala3/typesystem/valuetypes/TypeTypes.sc b/src/script/scala/progscala3/typesystem/valuetypes/TypeTypes.scala
similarity index 84%
rename from src/main/scala/progscala3/typesystem/valuetypes/TypeTypes.sc
rename to src/script/scala/progscala3/typesystem/valuetypes/TypeTypes.scala
index cda5aa4a..5f092188 100644
--- a/src/main/scala/progscala3/typesystem/valuetypes/TypeTypes.sc
+++ b/src/script/scala/progscala3/typesystem/valuetypes/TypeTypes.scala
@@ -1,4 +1,4 @@
-// src/main/scala/progscala3/typesystem/valuetypes/TypeTypes.sc
+// src/script/scala/progscala3/typesystem/valuetypes/TypeTypes.scala
 import progscala3.typesystem.valuetypes._
 
 val s11 = new Service1