definitions are not blocks
remove unnecessary nesting
improve naming consistency
improve readability
simplify folder name
resolve #160