Control by folder

Towards resolution of #345