reverted more files, fixed copyright issues