Avoid creating new folders outside our existing ones

Avoid creating new folders outside our existing ones #611