config update / some restructure