Changes to allow clean separation of local configs/plugins/data into other folders