Structurized Code

Added more structure to the Header organisation.