Feature detect subfolders

See #206