fix project structure

Author: kustosz

build.sbt

@@ -6,23 +6,21 @@ lazy val Benchmark = config("bench") extend Test
 
 lazy val enso = (project in file(".")).aggregate(syntax)
 
-lazy val syntax = (project in file("enso-lexer"))
-  .withId("enso-lexer")
+lazy val syntax = (project in file("syntax"))
   .configs(Benchmark)
   .settings(
     inConfig(Benchmark)(Defaults.testSettings),
-    name := "enso-lexer",
+    name := "syntax",
     organization := "org.enso",
     scalaVersion := "2.12.8",
     scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-Xlint"),
     publishArtifact := false,
     libraryDependencies ++= Seq(
-      "com.storm-enroute" %% "scalameter" % "0.17" % "bench"
+      "com.storm-enroute" %% "scalameter" % "0.17" % "bench",
+      "org.typelevel" %% "cats-core" % "1.6.0",
+      "org.scalatest" %% "scalatest" % "3.0.5" % Test,
+      "com.lihaoyi"   %% "pprint"    % "0.5.3"
     ),
-    libraryDependencies += "org.typelevel" %% "cats-core" % "1.6.0",
-    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % Test,
-    libraryDependencies += "com.lihaoyi"   %% "pprint"    % "0.5.3",
-
     resolvers ++= Seq(
       "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
       "Sonatype OSS Releases"  at "https://oss.sonatype.org/content/repositories/releases"
@@ -32,5 +30,4 @@ lazy val syntax = (project in file("enso-lexer"))
     logBuffered := false
   )
   .settings(SbtJFlexPlugin.jflexSettings)
-  .settings(mainClass in (Compile,run) := Some("org.enso.main.Main"))
-
+  .settings(mainClass in (Compile,run) := Some("org.enso.syntax.Main"))

enso-lexer/src/bench/scala/org/enso/syntax/text/Lexer.scala renamed to syntax/src/bench/scala/org/enso/syntax/text/Lexer.scala

@@ -1,12 +1,12 @@
 
-package org.enso.main
+package org.enso.syntax
 
 // import org.enso.syntax.text.parser.{Parser}
-import java.io.{Reader,StringReader, StringWriter}
-import org.enso.syntax.text.xx.{Parser}
-import org.enso.syntax.text.xx.Parser.{Lexer => Tok}
+import java.io.{Reader, StringReader}
+
+import org.enso.syntax.text.lexer.{Scanner, EOF, Token}
+import org.enso.syntax.text.xx.Parser
 import org.enso.syntax.text.xx.Parser.Lexer._
-import org.enso.syntax.text.lexer.{Scanner,Token,Wildcard,EOF,EOL}
 // import org.enso.syntax.text.{parser => AST}
 import org.enso.syntax.text.parser.AST