Added ifndef headers, categorized items