small change
Merge branch 'COM_test'
removed COM stuff from master
For master branch, removed refs to COM from linker
move headers to include dir
refactored includes
Ugh