Rename parent_subtype/subtype/subtypes to parent_promise_type/promise_type/promise_types
Revert "Move GetSoftwareCacheFilename to proper place"

This reverts commit 34084fd6701cdd53a5f4ba935c324a822b432812.