Entity files in incorrect type directory causing strange problems

Currently, nothing in the module prevents you from placing an entity file in a directory that does not correspond to its entity type. This leads to strange problems. For example, the way I came across this issue was errors about duplicate keys in the database. Although I haven't debugged in detail, the entity type ID is stored fairly early in the import derived from the directory and it isn't actually checked whether that matches with the entity type in the serialized entity itself. I'll see if I can create a quick patch.