Reorganized the function call assignments into appropriate grouping
Fixed the header guards to be aligned with other names
reorg