For master branch, removed refs to COM from linker
move headers to include dir
refactored includes
moved stuff