Changes before reverting some files back to the way they wee from atmel.