Mostly moved some stuff around and solidified LICENSE file.
Merge remote-tracking branch 'origin/master'