Small file reorganization

Looks more exciting than it really is.