Fixed globbing to get files in current root directory to
Fixed up linking issues