Overhaul of all files