Arranged headers and started implementing tiny logging facility