Fix broken imports on some modules.
Add _namespace to all Entity subclasses