Restructured for and introduced sbt