Move files to new locations
Merge common statements.