Revert "Move files around"

This reverts commit 51f3306f33e09533f4b13453ba722f257f625f62.