re-org more files under lib/cask/dsl
Merge pull request #5931 from rolandwalker/dsl_layout_refactor

re-org more files under lib/cask/dsl/