Update namspaces

User and StorableBase???