Prepare to scale the domain: file reorganization
Storage: fix root path
Added one level of hierarchy