Add Linking, Improve  Parsing and Extraction

Also change to Build.scala from build.sbt