Moved Doctor's files to the new place and fixed a couple 1.7 errors