Fixing some files in the wrong place