Rename and restructure files and update imports.