code improvements for storage layer handling
Fixed clone project bug for Disk storage layer