Storage and PathUtil improving.
Resharper code cleanup.