Moved the Entity class back into the root namespace.