Revert "Revert "Move some files around""

This reverts commit 0ef797289173c23dc36960fe814b640c498ecf54.