Started modularising headers to their own directory