refactoring; renamed "Storage" namespace into "Domain" etc.