move modules around.

build.sbt

@@ -2,8 +2,6 @@ import Dependencies._
 import Util._
 
 def internalPath   = file("internal")
-def utilPath       = file("util")
-def cachePath      = file("cache")
 
 // ThisBuild settings take lower precedence,
 // but can be shared across the multi projects.
@@ -54,7 +52,7 @@ lazy val utilRoot: Project = (project in file(".")).
 // defines Java structures used across Scala versions, such as the API structures and relationships extracted by
 //   the analysis compiler phases and passed back to sbt.  The API structures are defined in a simple
 //   format from which Java sources are generated by the datatype generator Projproject
-lazy val utilInterface = (project in file("interface")).
+lazy val utilInterface = (project in internalPath / "util-interface").
   settings(
     commonSettings,
     javaOnlySettings,
@@ -71,7 +69,7 @@ lazy val utilInterface = (project in file("interface")).
     //   streams) map generateAPICached
   )
 
-lazy val utilControl = (project in utilPath / "control").
+lazy val utilControl = (project in internalPath / "util-control").
   settings(
     commonSettings,
     // Util.crossBuild,
@@ -79,7 +77,7 @@ lazy val utilControl = (project in utilPath / "control").
     crossScalaVersions := Seq(scala210, scala211)
   )
 
-lazy val utilCollection = (project in utilPath / "collection").
+lazy val utilCollection = (project in internalPath / "util-collection").
   settings(
     testedBaseSettings,
     Util.keywordsSettings,
@@ -88,7 +86,7 @@ lazy val utilCollection = (project in utilPath / "collection").
     crossScalaVersions := Seq(scala210, scala211)
   )
 
-lazy val utilApplyMacro = (project in utilPath / "appmacro").
+lazy val utilApplyMacro = (project in internalPath / "util-appmacro").
   dependsOn(utilCollection).
   settings(
     testedBaseSettings,
@@ -97,7 +95,7 @@ lazy val utilApplyMacro = (project in utilPath / "appmacro").
   )
 
 // Command line-related utilities.
-lazy val utilComplete = (project in utilPath / "complete").
+lazy val utilComplete = (project in internalPath / "util-complete").
   dependsOn(utilCollection, utilControl).
   settings(
     testedBaseSettings,
@@ -108,7 +106,7 @@ lazy val utilComplete = (project in utilPath / "complete").
   )
 
 // logging
-lazy val utilLogging = (project in utilPath / "log").
+lazy val utilLogging = (project in internalPath / "util-logging").
   dependsOn(utilInterface).
   settings(
     testedBaseSettings,
@@ -117,14 +115,14 @@ lazy val utilLogging = (project in utilPath / "log").
   )
 
 // Relation
-lazy val utilRelation = (project in utilPath / "relation").
+lazy val utilRelation = (project in internalPath / "util-relation").
   settings(
     testedBaseSettings,
     name := "Util Relation"
   )
 
 // A logic with restricted negation as failure for a unique, stable model
-lazy val utilLogic = (project in utilPath / "logic").
+lazy val utilLogic = (project in internalPath / "util-logic").
   dependsOn(utilCollection, utilRelation).
   settings(
     testedBaseSettings,
@@ -132,7 +130,7 @@ lazy val utilLogic = (project in utilPath / "logic").
   )
 
 // Persisted caching based on SBinary
-lazy val utilCache = (project in cachePath).
+lazy val utilCache = (project in internalPath / "util-cache").
   dependsOn(utilCollection).
   settings(
     commonSettings,
@@ -141,7 +139,7 @@ lazy val utilCache = (project in cachePath).
   )
 
 // Builds on cache to provide caching for filesystem-related operations
-lazy val utilTracking = (project in cachePath / "tracking").
+lazy val utilTracking = (project in internalPath / "util-tracking").
   dependsOn(utilCache).
   settings(
     commonSettings,