Moved some files around and greatly changed cmake files
Fixed new .lib and .h files
MJeh