Moved, renamed, and removed stuff to make more obvious
Merge origin/master