merging civetta headers and cpp files into one of each
re-formating the code