Updated header, moved some stuff around and removed lots of duplicate files.