Handle layouts in subfolders.
Merge branch 'release/v2.0.3'

* release/v2.0.3:
  Handle layouts in subfolders.