Reorganize, implement some dynamic config loading.