Moved several files to NET40 in preparation to an eventual shared project refactoring