Add Headers and reorganize a bit