Moved target_link_libraries behind add_library
Now using a library variable
More cleanups
Cleanups and renaming
Proper indentation
More cleaning up to match header edits