Did lots of cleanup. Synchronized AtmelStudio(R) workspace with the sources.