Start of cleanup.
Merge remote-tracking branch 'upstream/master'

fuck, never move folders around.