Refactor Factor sub-type solution

[mrioan]

It seems that what was discussed here will not be addressed during MFA's implementation for the sake of speed.

I am creating this issue so we remember to get rid of SubtypeDispatchingResourceFactory as suggested by Mario in that comment.