Clean up namespaces

Remove properties from StorableBase