Added separate data/config directories