Reorganized (acc to sbt ...), added some more stuff