Re-re-updated factory default for entity factory
Rename collection factory to just inside entity, get rid of unneeded extra namespace
adding zephir code