Added support for .hrl files and tidied up naming conventions etc