General: Renaming files, and removing old/unused fragments
General: Fixing references