Moved the EntityField stuff to a non source folder for later use.