Cleanup to prepare for new file layout