Moved lots of files from the merge into place in the new file hierarchy.
Merge pull request #183 from sprowell/sbt

Moved lots of files from the merge into place in the new file hierarchy.